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

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

Issue 12094026: Skip a first-run import on Mac when there is nothing left to import. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove fragile check Created 7 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
« no previous file with comments | « no previous file | 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 // Imports bookmarks and/or browser items (depending on platform support) 129 // Imports bookmarks and/or browser items (depending on platform support)
130 // in this process. This function is paired with first_run::ImportSettings(). 130 // in this process. This function is paired with first_run::ImportSettings().
131 // This function might or might not show a visible UI depending on the 131 // This function might or might not show a visible UI depending on the
132 // cmdline parameters. 132 // cmdline parameters.
133 int ImportNow(Profile* profile, const CommandLine& cmdline); 133 int ImportNow(Profile* profile, const CommandLine& cmdline);
134 134
135 // Returns the path for the master preferences file. 135 // Returns the path for the master preferences file.
136 FilePath MasterPrefsPath(); 136 FilePath MasterPrefsPath();
137 137
138 // Set a master preferences file path that overrides platform defaults.
139 void SetMasterPrefsPathForTesting(const FilePath& master_prefs);
140
138 // The master preferences is a JSON file with the same entries as the 141 // The master preferences is a JSON file with the same entries as the
139 // 'Default\Preferences' file. This function locates this file from a standard 142 // 'Default\Preferences' file. This function locates this file from a standard
140 // location and processes it so it becomes the default preferences in the 143 // location and processes it so it becomes the default preferences in the
141 // profile pointed to by |user_data_dir|. After processing the file, the 144 // profile pointed to by |user_data_dir|. After processing the file, the
142 // function returns a value from the ProcessMasterPreferencesResult enum, 145 // function returns a value from the ProcessMasterPreferencesResult enum,
143 // indicating whether the first run flow should be shown, skipped, or whether 146 // indicating whether the first run flow should be shown, skipped, or whether
144 // the browser should exit. 147 // the browser should exit.
145 // 148 //
146 // This function destroys any existing prefs file and it is meant to be 149 // This function destroys any existing prefs file and it is meant to be
147 // invoked only on first run. 150 // invoked only on first run.
(...skipping 22 matching lines...) Expand all
170 const content::NotificationDetails& details) OVERRIDE; 173 const content::NotificationDetails& details) OVERRIDE;
171 174
172 content::NotificationRegistrar registrar_; 175 content::NotificationRegistrar registrar_;
173 176
174 DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher); 177 DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher);
175 }; 178 };
176 179
177 } // namespace first_run 180 } // namespace first_run
178 181
179 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698