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

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

Issue 12314093: Capture the exit status of the first-run AutoImport and make it available to tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable WaitForImport on Linux 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
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void AutoImport(Profile* profile, 136 void AutoImport(Profile* profile,
137 bool homepage_defined, 137 bool homepage_defined,
138 int import_items, 138 int import_items,
139 int dont_import_items, 139 int dont_import_items,
140 ProcessSingleton* process_singleton); 140 ProcessSingleton* process_singleton);
141 141
142 // Does remaining first run tasks for |profile| and makes Chrome default browser 142 // Does remaining first run tasks for |profile| and makes Chrome default browser
143 // if |make_chrome_default|. This can pop the first run consent dialog on linux. 143 // if |make_chrome_default|. This can pop the first run consent dialog on linux.
144 void DoPostImportTasks(Profile* profile, bool make_chrome_default); 144 void DoPostImportTasks(Profile* profile, bool make_chrome_default);
145 145
146 // Whether a first-run import was triggered before the browser mainloop began.
147 // This is used in testing to verify import startup actions that occur before
148 // an observer can be registered in the test.
149 bool DidPerformProfileImport(bool* exited_successfully);
150
146 // Imports bookmarks and/or browser items (depending on platform support) 151 // Imports bookmarks and/or browser items (depending on platform support)
147 // in this process. This function is paired with first_run::ImportSettings(). 152 // in this process. This function is paired with first_run::ImportSettings().
148 // This function might or might not show a visible UI depending on the 153 // This function might or might not show a visible UI depending on the
149 // cmdline parameters. 154 // cmdline parameters.
150 int ImportNow(Profile* profile, const CommandLine& cmdline); 155 int ImportNow(Profile* profile, const CommandLine& cmdline);
151 156
152 // Returns the path for the master preferences file. 157 // Returns the path for the master preferences file.
153 base::FilePath MasterPrefsPath(); 158 base::FilePath MasterPrefsPath();
154 159
155 // Set a master preferences file path that overrides platform defaults. 160 // Set a master preferences file path that overrides platform defaults.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 const content::NotificationDetails& details) OVERRIDE; 195 const content::NotificationDetails& details) OVERRIDE;
191 196
192 content::NotificationRegistrar registrar_; 197 content::NotificationRegistrar registrar_;
193 198
194 DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher); 199 DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher);
195 }; 200 };
196 201
197 } // namespace first_run 202 } // namespace first_run
198 203
199 #endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_ 204 #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