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

Unified Diff: chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Issue 134263005: Implement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for various iframe bugs Created 6 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
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 f7dc93911e505f4cfe2b2d5f44229f762f831b45..23c91f6f539f7d20ce0b80e9643f381ade738129 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -456,10 +456,14 @@ void OneClickSigninSyncStarter::ShowSettingsPage(bool configure_sync) {
GURL current_url = web_contents()->GetLastCommittedURL();
bool is_chrome_signin_url =
current_url.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL;
+ bool is_same_profile =
+ Profile::FromBrowserContext(web_contents()->GetBrowserContext()) ==
+ profile_;
use_same_tab =
(is_chrome_signin_url ||
signin::IsContinueUrlForWebBasedSigninFlow(current_url)) &&
- !signin::IsAutoCloseEnabledInURL(current_url);
+ !signin::IsAutoCloseEnabledInURL(current_url) &&
+ is_same_profile;
}
if (profile_sync_service) {
// Need to navigate to the settings page and display the sync UI.
« no previous file with comments | « chrome/browser/resources/inline_login/inline_login.js ('k') | chrome/browser/ui/webui/signin/inline_login_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698