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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ 5 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
6 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ 6 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // decision of making chrome default browser in post import tasks. 153 // decision of making chrome default browser in post import tasks.
154 void DoPostImportTasks(Profile* profile, bool make_chrome_default_for_user); 154 void DoPostImportTasks(Profile* profile, bool make_chrome_default_for_user);
155 155
156 // Returns the current state of AutoImport as recorded in a bitfield formed from 156 // Returns the current state of AutoImport as recorded in a bitfield formed from
157 // values in AutoImportState. 157 // values in AutoImportState.
158 uint16 auto_import_state(); 158 uint16 auto_import_state();
159 159
160 // Set a master preferences file path that overrides platform defaults. 160 // Set a master preferences file path that overrides platform defaults.
161 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs); 161 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
162 162
163 // The master preferences is a JSON file with the same entries as the 163 // The master_preferences is a JSON file with the same entries as the
164 // 'Default\Preferences' file. This function locates this file from a standard 164 // 'Default\Preferences' file. This function locates this file from a standard
165 // location and processes it so it becomes the default preferences in the 165 // 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.
166 // profile pointed to by |user_data_dir|. After processing the file, the 166 // preferences in the profile pointed to by |user_data_dir|. After processing
167 // function returns a value from the ProcessMasterPreferencesResult enum, 167 // the file, this function returns a value from the
168 // indicating whether the first run flow should be shown, skipped, or whether 168 // ProcessMasterPreferencesResult enum, indicating whether the first run flow
169 // the browser should exit. 169 // should be shown, skipped, or whether the browser should exit.
170 // 170 //
171 // This function destroys any existing prefs file and it is meant to be 171 // This function overwrites any existing Preferences file and is only meant to
172 // invoked only on first run. 172 // be invoked on first run.
173 // 173 //
174 // See chrome/installer/util/master_preferences.h for a description of 174 // See chrome/installer/util/master_preferences.h for a description of
175 // 'master_preferences' file. 175 // 'master_preferences' file.
176 ProcessMasterPreferencesResult ProcessMasterPreferences( 176 ProcessMasterPreferencesResult ProcessMasterPreferences(
177 const base::FilePath& user_data_dir, 177 const base::FilePath& user_data_dir,
178 MasterPrefs* out_prefs); 178 MasterPrefs* out_prefs);
179 179
180 } // namespace first_run 180 } // namespace first_run
181 181
182 #endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ 182 #endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
OLDNEW
« 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