chrome/browser/first_run/first_run.cc - Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/first_run/first_run.cc

Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge Created 5 years, 10 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 | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/password_manager/save_password_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 95fb29d6aa08b7930d7faf72324cc916401776c0..0e88b9fb6fbcab8446c6578009906c8ec06debac 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,15 +364,14 @@ 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() ==

- chrome::GetSettingsUrl(chrome::kSyncSetupSubPage)))) {

+ contents->GetURL() ==

+ chrome::GetSettingsUrl(chrome::kSyncSetupSubPage))) {

return;

}