Merge pull request #111 from brave/startup-pref-2

Use default pref for setting preserve profile pref
brave · May 21, 2018 · bb2a6cb · bb2a6cb
2 parents 63c8daf + 68b54e3
commit bb2a6cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -5,6 +5,8 @@
 #include "brave/browser/brave_profile_prefs.h"
 
 #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
+#include "chrome/common/pref_names.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/signin_pref_names.h"
@@ -15,6 +17,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   brave_shields::BraveShieldsWebContentsObserver::RegisterProfilePrefs(registry);
   // Register any default pref overrides here
   registry->SetDefaultPrefValue(prefs::kSigninAllowed, base::Value(false));
+  registry->SetDefaultPrefValue(prefs::kRestoreOnStartup,
+      base::Value(SessionStartupPref::kPrefValueLast));
 }
 
 }  // namespace brave

diff --git a/patches/chrome-browser-prefs-session_startup_pref.cc.patch b/patches/chrome-browser-prefs-session_startup_pref.cc.patch