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

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

Issue 14328019: Some first_run code cleanups (extracted from https://codereview.chromium.org/12670013 to keep that … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r196136 Created 7 years, 8 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_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run_win.cc
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 8a5a9a514d5e3d6d9fddefe9628f9d5bfc3932a0..aeaab3384c8d4f20c86193cf6894ca78d6bf6ac5 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -497,6 +497,14 @@ bool ShowPostInstallEULAIfNeeded(installer::MasterPreferences* install_prefs) {
return true;
}
+base::FilePath MasterPrefsPath() {
+ // The standard location of the master prefs is next to the chrome binary.
+ base::FilePath master_prefs;
+ if (!PathService::Get(base::DIR_EXE, &master_prefs))
+ return base::FilePath();
+ return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+}
+
} // namespace internal
} // namespace first_run
@@ -512,12 +520,4 @@ int ImportNow(Profile* profile, const CommandLine& cmdline) {
return return_code;
}
-base::FilePath MasterPrefsPath() {
- // The standard location of the master prefs is next to the chrome binary.
- base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
- return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
-}
-
} // namespace first_run
« no previous file with comments | « chrome/browser/first_run/first_run_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698