Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4025)

Unified Diff: chrome/browser/first_run/first_run.cc

Issue 9153008: Progressively refacto FirstRun class to first_run namespace(part 4). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/first_run/first_run.h ('k') | chrome/browser/first_run/first_run_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run.cc
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 2a3ef509132475acedddfdc96b65ef3b44f84968..c0bad3727f461f3610e56fb03f6841483a8708d9 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -341,6 +341,21 @@ bool SetPersonalDataManagerFirstRunPref() {
return true;
}
+bool SetOEMFirstRunBubblePref() {
+ PrefService* local_state = g_browser_process->local_state();
+ if (!local_state)
+ return false;
+ if (!local_state->FindPreference(prefs::kShouldUseOEMFirstRunBubble)) {
+ local_state->RegisterBooleanPref(prefs::kShouldUseOEMFirstRunBubble, false);
+ local_state->SetBoolean(prefs::kShouldUseOEMFirstRunBubble, true);
+ }
+ return true;
+}
+
+bool ShouldShowSearchEngineSelector(const TemplateURLService* model) {
+ return model && !model->is_default_search_managed();
+}
+
} // namespace first_run
// FirstRun -------------------------------------------------------------------
@@ -362,7 +377,7 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
MasterPrefs* out_prefs) {
DCHECK(!user_data_dir.empty());
- FilePath master_prefs = MasterPrefsPath();
+ FilePath master_prefs = first_run::MasterPrefsPath();
if (master_prefs.empty())
return true;
installer::MasterPreferences prefs(master_prefs);
@@ -414,7 +429,7 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
if (prefs.GetBool(installer::master_preferences::kAltFirstRunBubble,
&value) && value) {
- FirstRun::SetOEMFirstRunBubblePref();
+ first_run::SetOEMFirstRunBubblePref();
}
FilePath user_prefs = GetDefaultPrefFilePath(true, user_data_dir);
@@ -591,20 +606,3 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
return false;
}
-
-// static
-bool FirstRun::ShouldShowSearchEngineSelector(const TemplateURLService* model) {
- return model && !model->is_default_search_managed();
-}
-
-// static
-bool FirstRun::SetOEMFirstRunBubblePref() {
- PrefService* local_state = g_browser_process->local_state();
- if (!local_state)
- return false;
- if (!local_state->FindPreference(prefs::kShouldUseOEMFirstRunBubble)) {
- local_state->RegisterBooleanPref(prefs::kShouldUseOEMFirstRunBubble, false);
- local_state->SetBoolean(prefs::kShouldUseOEMFirstRunBubble, true);
- }
- return true;
-}
« no previous file with comments | « chrome/browser/first_run/first_run.h ('k') | chrome/browser/first_run/first_run_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698