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

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

Issue 145053004: Let chrome_prefs handle Preferences initialization from master_preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 6 years, 10 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
Index: chrome/browser/first_run/first_run.h
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 58911f3062a8d4a4a1282b9ee076ddd1b5fb619d..412fef610aad084dc6fd5d3de77b65fe772c98d2 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -160,16 +160,16 @@ uint16 auto_import_state();
// Set a master preferences file path that overrides platform defaults.
void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
-// The master preferences is a JSON file with the same entries as the
+// The master_preferences is a JSON file with the same entries as the
// 'Default\Preferences' file. This function locates this file from a standard
-// location and processes it so it becomes the default preferences in the
-// profile pointed to by |user_data_dir|. After processing the file, the
-// function returns a value from the ProcessMasterPreferencesResult enum,
-// indicating whether the first run flow should be shown, skipped, or whether
-// the browser should exit.
+// location, processes it, and hands it to ProfileImpl so it becomes the default
erikwright (departed) 2014/02/04 20:55:28 I find "hands it to ProfileImpl" to be an implemen
gab 2014/02/04 22:32:11 Done.
+// preferences in the profile pointed to by |user_data_dir|. After processing
+// the file, this function returns a value from the
+// ProcessMasterPreferencesResult enum, indicating whether the first run flow
+// should be shown, skipped, or whether the browser should exit.
//
-// This function destroys any existing prefs file and it is meant to be
-// invoked only on first run.
+// This function overwrites any existing Preferences file and is only meant to
+// be invoked on first run.
//
// See chrome/installer/util/master_preferences.h for a description of
// 'master_preferences' file.
« no previous file with comments | « no previous file | chrome/browser/first_run/first_run.cc » ('j') | chrome/browser/first_run/first_run_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698