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

Unified Diff: chrome/browser/browser_main.cc

Issue 48114: Reuse the eula terms from the chrome resources... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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.cc » ('j') | chrome/browser/first_run.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 11718)
+++ chrome/browser/browser_main.cc (working copy)
@@ -269,15 +269,6 @@
local_state->SetString(prefs::kApplicationLocale, install_lang);
if (GoogleUpdateSettings::GetCollectStatsConsent())
local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
- // On first run, we need to process the master preferences before the
- // browser's profile_manager object is created.
- first_run_ui_bypass =
- !FirstRun::ProcessMasterPreferences(user_data_dir, FilePath(), NULL);
-
- // If we are running in App mode, we do not want to show the importer
- // (first run) UI.
- if (!first_run_ui_bypass && parsed_command_line.HasSwitch(switches::kApp))
- first_run_ui_bypass = true;
}
// If the local state file for the current profile doesn't exist and the
@@ -310,6 +301,19 @@
ResourceBundle::GetSharedInstance().LoadThemeResources();
}
+ if (is_first_run) {
+ // On first run, we need to process the master preferences before the
+ // browser's profile_manager object is created, but after ResourceBundle
+ // is initialized.
+ first_run_ui_bypass =
+ !FirstRun::ProcessMasterPreferences(user_data_dir, FilePath(), NULL);
+
+ // If we are running in App mode, we do not want to show the importer
+ // (first run) UI.
+ if (!first_run_ui_bypass && parsed_command_line.HasSwitch(switches::kApp))
+ first_run_ui_bypass = true;
+ }
+
if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) {
// Display a warning if the user is running windows 2000.
// TODO(port). We should probably change this to a "check for minimum
« no previous file with comments | « no previous file | chrome/browser/first_run.cc » ('j') | chrome/browser/first_run.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698