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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 10837222: Enable EULA dialog to be shown from metro Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg, the third. Created 8 years, 3 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/first_run.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 65d1c7a5ee56268a0104f0de130ce3bc4a35874e..c0d607a065193cbab1bc98a6ad202fcf02ab85ec 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -823,8 +823,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// is initialized.
first_run_ui_bypass_ = false; // True to skip first run UI.
if (is_first_run_) {
- first_run_ui_bypass_ = !first_run::ProcessMasterPreferences(
- user_data_dir_, master_prefs_.get());
+ first_run::ProcessMasterPreferencesResult pmp_result =
+ first_run::ProcessMasterPreferences(user_data_dir_,
+ master_prefs_.get());
+ if (pmp_result == first_run::EULA_EXIT_NOW)
+ return chrome::RESULT_CODE_EULA_REFUSED;
+
+ first_run_ui_bypass_ = (pmp_result == first_run::SKIP_FIRST_RUN);
+
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
// If we are running in App mode, we do not want to show the importer
« no previous file with comments | « no previous file | chrome/browser/first_run/first_run.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698