| 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_,
|
|
|