Index: chrome/browser/first_run/first_run.cc |
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc |
index 23543ef1b25f96915ccee9944106584e1ba44e9f..afb8c8fa7e21a9008338898ea636b95d07b31124 100644 |
--- a/chrome/browser/first_run/first_run.cc |
+++ b/chrome/browser/first_run/first_run.cc |
@@ -36,7 +36,6 @@ |
#include "chrome/browser/search_engines/template_url_service_factory.h" |
#include "chrome/browser/shell_integration.h" |
#include "chrome/browser/signin/signin_manager_factory.h" |
-#include "chrome/browser/signin/signin_promo.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_finder.h" |
#include "chrome/browser/ui/chrome_pages.h" |
@@ -365,13 +364,12 @@ void FirstRunBubbleLauncher::Observe( |
content::WebContents* contents = |
browser->tab_strip_model()->GetActiveWebContents(); |
- // Suppress the first run bubble if a Gaia sign in page, the continue |
- // URL for the sign in page or the sync setup page is showing. |
+ // Suppress the first run bubble if a Gaia sign in page or the sync setup |
+ // page is showing. |
if (contents && |
(contents->GetURL().GetOrigin().spec() == |
chrome::kChromeUIChromeSigninURL || |
gaia::IsGaiaSignonRealm(contents->GetURL().GetOrigin()) || |
- signin::IsContinueUrlForWebBasedSigninFlow(contents->GetURL()) || |
(contents->GetURL() == |
gab
2015/02/10 15:13:09
nit: Would you mind removing the extra () around t
Roger Tawa OOO till Jul 10th
2015/02/10 15:48:29
Done.
|
chrome::GetSettingsUrl(chrome::kSyncSetupSubPage)))) { |
return; |