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

Side by Side Diff: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

Issue 2519123003: Fix issue that closes sync confirm window after second sign-in in one profile. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" 5 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 true, false, profile_, create_status_); 194 true, false, profile_, create_status_);
195 } else { 195 } else {
196 OnClientOAuthSuccessAndBrowserOpened(result, profile_, create_status_); 196 OnClientOAuthSuccessAndBrowserOpened(result, profile_, create_status_);
197 } 197 }
198 } 198 }
199 199
200 void InlineSigninHelper::OnClientOAuthSuccessAndBrowserOpened( 200 void InlineSigninHelper::OnClientOAuthSuccessAndBrowserOpened(
201 const ClientOAuthResult& result, 201 const ClientOAuthResult& result,
202 Profile* profile, 202 Profile* profile,
203 Profile::CreateStatus status) { 203 Profile::CreateStatus status) {
204 UnlockProfileAndHideLoginUI(profile_->GetPath(), handler_.get()); 204 if (signin::IsForceSigninEnabled())
205 UnlockProfileAndHideLoginUI(profile_->GetPath(), handler_.get());
205 content::WebContents* contents = NULL; 206 content::WebContents* contents = NULL;
206 Browser* browser = NULL; 207 Browser* browser = NULL;
207 if (handler_) { 208 if (handler_) {
208 contents = handler_->web_ui()->GetWebContents(); 209 contents = handler_->web_ui()->GetWebContents();
209 browser = handler_->GetDesktopBrowser(); 210 browser = handler_->GetDesktopBrowser();
210 } 211 }
211 212
212 AboutSigninInternals* about_signin_internals = 213 AboutSigninInternals* about_signin_internals =
213 AboutSigninInternalsFactory::GetForProfile(profile_); 214 AboutSigninInternalsFactory::GetForProfile(profile_);
214 about_signin_internals->OnRefreshTokenReceived("Successful"); 215 about_signin_internals->OnRefreshTokenReceived("Successful");
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 } 868 }
868 869
869 if (show_account_management) { 870 if (show_account_management) {
870 browser->window()->ShowAvatarBubbleFromAvatarButton( 871 browser->window()->ShowAvatarBubbleFromAvatarButton(
871 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, 872 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
872 signin::ManageAccountsParams(), 873 signin::ManageAccountsParams(),
873 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); 874 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
874 } 875 }
875 } 876 }
876 } 877 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698