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

Unified Diff: chrome/browser/browser_main.cc

Issue 2934011: New first run sequence for Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Added support for control of all import via master_preferences Created 10 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/first_run.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 52523)
+++ chrome/browser/browser_main.cc (working copy)
@@ -1060,6 +1060,15 @@
// touches reads preferences.
if (is_first_run) {
if (!first_run_ui_bypass) {
+#if defined(OS_WIN)
+ FirstRun::AutoImport(profile,
+ master_prefs.homepage_defined,
+ master_prefs.do_import_items,
+ master_prefs.dont_import_items,
+ master_prefs.run_search_engine_experiment,
+ master_prefs.randomize_search_engine_experiment,
+ &process_singleton);
+#else
if (!OpenFirstRunDialog(profile,
master_prefs.homepage_defined,
master_prefs.do_import_items,
@@ -1067,9 +1076,9 @@
master_prefs.run_search_engine_experiment,
master_prefs.randomize_search_engine_experiment,
&process_singleton)) {
- // The user cancelled the first run dialog box, we should exit Chrome.
return ResultCodes::NORMAL_EXIT;
}
+#endif
#if defined(OS_POSIX)
// On Windows, the download is tagged with enable/disable stats so there
// is no need for this code.
@@ -1079,7 +1088,7 @@
if (GoogleUpdateSettings::GetCollectStatsConsent())
local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
#endif // OS_POSIX
- }
+ } // if (!first_run_ui_bypass)
Browser::SetNewHomePagePrefs(user_prefs);
}
« no previous file with comments | « no previous file | chrome/browser/first_run.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698