diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 17:13:52 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 17:13:52 +0000 |
| commit | 8a585cbb238840eadf792f120d1b80a321b37220 (patch) | |
| tree | 3452a7cf6d16f488de4fa897f766a363ec894b53 /chrome/browser/first_run | |
| parent | c1b3468d91c5ec0bda9192c4781cefb43cc90379 (diff) | |
| download | chromium_src-8a585cbb238840eadf792f120d1b80a321b37220.zip chromium_src-8a585cbb238840eadf792f120d1b80a321b37220.tar.gz chromium_src-8a585cbb238840eadf792f120d1b80a321b37220.tar.bz2 | |
Implement settings om a window
Adds SettingsWindowManager which manages settings popup windows, one per Profile.
Implemented behind the flag -enable-settings-window
Includes some cleanup in chrome_pages for settings url generation and showing settings by profile in general.
Also moves logic for whether to display the Location Bar in a Browser to ShowLocationBar() (affects code for streamlined hosted apps, shouldn't change the logic any).
BUG=342983
R=ben@chromium.org, calamity@chromium.org
Review URL: https://codereview.chromium.org/178863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index d89e76b..ee7d583 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -41,6 +41,7 @@ #include "chrome/browser/signin/signin_tracker.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -361,8 +362,8 @@ void FirstRunBubbleLauncher::Observe( chrome::kChromeUIChromeSigninURL || gaia::IsGaiaSignonRealm(contents->GetURL().GetOrigin()) || signin::IsContinueUrlForWebBasedSigninFlow(contents->GetURL()) || - contents->GetURL() == GURL(std::string(chrome::kChromeUISettingsURL) + - chrome::kSyncSetupSubPage))) { + (contents->GetURL() == + chrome::GetSettingsUrl(chrome::kSyncSetupSubPage)))) { return; } |