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

Unified Diff: chrome/browser/browser_signin.cc

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored 2-factor error passing Created 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_signin.cc
diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc
index 0c5dc694fe8242dea3b61c83067828344deb9c2c..5e63c876d8d3de9bfa26e8efea77b0e5a0ac142d 100644
--- a/chrome/browser/browser_signin.cc
+++ b/chrome/browser/browser_signin.cc
@@ -277,6 +277,7 @@ void BrowserSignin::Cancel() {
if (delegate_) {
delegate_->OnLoginFailure(GoogleServiceAuthError(
GoogleServiceAuthError::REQUEST_CANCELED));
+ GetProfileSyncService()->OnUserCancelledDialog();
}
OnLoginFinished();
}
@@ -322,7 +323,7 @@ void BrowserSignin::UnregisterAuthNotifications() {
void BrowserSignin::ShowSigninTabModal(TabContents* tab_contents) {
// TODO(johnnyg): Need a linux views implementation for ConstrainedHtmlDialog.
-#if defined(OS_WIN) || !defined(TOOLKIT_VIEWS)
+#if defined(OS_WIN) || defined(OS_CHROMEOS) || !defined(TOOLKIT_VIEWS)
html_dialog_ui_delegate_ = CreateHtmlDialogUI();
ConstrainedHtmlUI::CreateConstrainedHtmlDialog(profile_,
html_dialog_ui_delegate_,
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698