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

Unified Diff: chrome/browser/ui/sync/one_click_signin_sync_starter.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/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index 080db0ecf4e066b78173e765cc8baeba5e09e21e..ad9d1f29b4201f1990774b6f12771febed8ace9b 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -40,7 +40,6 @@
#include "chrome/grit/generated_resources.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_metrics.h"
-#include "components/signin/core/common/profile_management_switches.h"
#include "components/sync_driver/sync_prefs.h"
#include "net/url_request/url_request_context_getter.h"
#include "ui/base/l10n/l10n_util.h"
@@ -430,8 +429,6 @@ void OneClickSigninSyncStarter::SigninFailed(
}
void OneClickSigninSyncStarter::SigninSuccess() {
- if (switches::IsEnableWebBasedSignin())
- MergeSessionComplete(GoogleServiceAuthError(GoogleServiceAuthError::NONE));
}
void OneClickSigninSyncStarter::MergeSessionComplete(
@@ -535,8 +532,7 @@ void OneClickSigninSyncStarter::ShowSettingsPage(bool configure_sync) {
Profile::FromBrowserContext(web_contents()->GetBrowserContext()) ==
profile_;
use_same_tab =
- (is_chrome_signin_url ||
- signin::IsContinueUrlForWebBasedSigninFlow(current_url)) &&
+ is_chrome_signin_url &&
!signin::IsAutoCloseEnabledInURL(current_url) &&
is_same_profile;
}
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698