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

Side by Side Diff: chrome/browser/first_run/first_run.h

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // This is used in testing to verify import startup actions that occur before 150 // This is used in testing to verify import startup actions that occur before
151 // an observer can be registered in the test. 151 // an observer can be registered in the test.
152 bool DidPerformProfileImport(bool* exited_successfully); 152 bool DidPerformProfileImport(bool* exited_successfully);
153 153
154 // Imports bookmarks and/or browser items (depending on platform support) 154 // Imports bookmarks and/or browser items (depending on platform support)
155 // in this process. This function is paired with first_run::ImportSettings(). 155 // in this process. This function is paired with first_run::ImportSettings().
156 // This function might or might not show a visible UI depending on the 156 // This function might or might not show a visible UI depending on the
157 // cmdline parameters. 157 // cmdline parameters.
158 int ImportNow(Profile* profile, const CommandLine& cmdline); 158 int ImportNow(Profile* profile, const CommandLine& cmdline);
159 159
160 // Returns the path for the master preferences file.
161 base::FilePath MasterPrefsPath();
162
163 // Set a master preferences file path that overrides platform defaults. 160 // Set a master preferences file path that overrides platform defaults.
164 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs); 161 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
165 162
166 // 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
167 // 'Default\Preferences' file. This function locates this file from a standard 164 // 'Default\Preferences' file. This function locates this file from a standard
168 // location and processes it so it becomes the default preferences in the 165 // location and processes it so it becomes the default preferences in the
169 // profile pointed to by |user_data_dir|. After processing the file, the 166 // profile pointed to by |user_data_dir|. After processing the file, the
170 // function returns a value from the ProcessMasterPreferencesResult enum, 167 // function returns a value from the ProcessMasterPreferencesResult enum,
171 // indicating whether the first run flow should be shown, skipped, or whether 168 // indicating whether the first run flow should be shown, skipped, or whether
172 // the browser should exit. 169 // the browser should exit.
(...skipping 25 matching lines...) Expand all
198 const content::NotificationDetails& details) OVERRIDE; 195 const content::NotificationDetails& details) OVERRIDE;
199 196
200 content::NotificationRegistrar registrar_; 197 content::NotificationRegistrar registrar_;
201 198
202 DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher); 199 DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher);
203 }; 200 };
204 201
205 } // namespace first_run 202 } // namespace first_run
206 203
207 #endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ 204 #endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698