Allow sync with 2-factor StrongAuth accounts in ChromeOS.

chrome/browser/browser_signin.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_signin.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
@@ skipping 259 matching lines @@
     }
     default:
       NOTREACHED();
   }
 }
 
 void BrowserSignin::Cancel() {
   if (delegate_) {
     delegate_->OnLoginFailure(GoogleServiceAuthError(
         GoogleServiceAuthError::REQUEST_CANCELED));
+    GetProfileSyncService()->OnUserCancelledDialog();
   }
   OnLoginFinished();
 }
 
 void BrowserSignin::OnLoginFinished() {
   if (html_dialog_ui_delegate_)
     html_dialog_ui_delegate_->ForceDialogClose();
   // The dialog will be deleted by DOMUI due to the dialog close,
   // don't hold a reference.
   html_dialog_ui_delegate_ = NULL;
@@ skipping 25 matching lines @@
   registrar_.Remove(this,
                     NotificationType::GOOGLE_SIGNIN_SUCCESSFUL,
                     Source<Profile>(profile_));
   registrar_.Remove(this,
                     NotificationType::GOOGLE_SIGNIN_FAILED,
                     Source<Profile>(profile_));
 }
 
 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_,
                                                  tab_contents);
 #endif
 }