diff options
| author | motek@chromium.org <motek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 22:23:38 +0000 |
|---|---|---|
| committer | motek@chromium.org <motek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 22:23:38 +0000 |
| commit | 693baa5df24716eb9002c8fb1834a2ee6d185520 (patch) | |
| tree | 540281c5f567896d978a162fd95c18c9389995c4 /chrome/browser/first_run | |
| parent | a0ac8af14b1c6980079cb938dc22e0e82f9a2034 (diff) | |
| download | chromium_src-693baa5df24716eb9002c8fb1834a2ee6d185520.zip chromium_src-693baa5df24716eb9002c8fb1834a2ee6d185520.tar.gz chromium_src-693baa5df24716eb9002c8fb1834a2ee6d185520.tar.bz2 | |
Prototype version of the first-run dialog for Windows 8.
The new UI supports both dialog and in-tab versions. Its purpose is to
set Chrome as default browser when running first time and to re-launch it
in Metro mode.
R=grt,gab,jhawkins,sky
BUG=131838
TEST=
Review URL: https://chromiumcodereview.appspot.com/10539169
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index d384638..8d77bbd 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -519,6 +519,10 @@ void FirstRunBubbleLauncher::Observe( if (contents->GetURL().host() == chrome::kChromeUISyncPromoHost) return; + // Suppress the first run bubble if 'make chrome metro' flow is showing. + if (contents->GetURL().host() == chrome::kChromeUIMetroFlowHost) + return; + // Suppress the first run bubble if the NTP sync promo bubble is showing. if (contents->GetURL().host() == chrome::kChromeUINewTabHost) { NewTabUI* new_tab_ui = diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index eb64d8c..906f0ec 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -28,6 +28,8 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/shell_integration.h" +#include "chrome/browser/ui/startup/default_browser_prompt.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_result_codes.h" @@ -548,6 +550,7 @@ void AutoImport( process_singleton->Unlock(); CreateSentinel(); #endif // !defined(USE_AURA) + browser::ShowFirstRunDefaultBrowserPrompt(profile); } int ImportNow(Profile* profile, const CommandLine& cmdline) { |