Make sync/sign-in error notifications actionable on click.

chrome/browser/signin/signin_error_notifier_ash.cc

 // Copyright 2014 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/signin/signin_error_notifier_ash.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/system_notifier.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
   virtual bool HasClickedListener() OVERRIDE;
   virtual void Click() OVERRIDE;
   virtual void ButtonClick(int button_index) OVERRIDE;
   virtual std::string id() const OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
 
  protected:
   virtual ~SigninNotificationDelegate();
 
  private:
+  void FixSignIn();
+
   // Unique id of the notification.
   const std::string id_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninNotificationDelegate);
 };
 
 SigninNotificationDelegate::SigninNotificationDelegate(
     const std::string& id,
@@ skipping 12 matching lines @@
 }
 
 void SigninNotificationDelegate::Close(bool by_user) {
 }
 
 bool SigninNotificationDelegate::HasClickedListener() {
   return false;
 }
 
 void SigninNotificationDelegate::Click() {
+  FixSignIn();
 }
 
 void SigninNotificationDelegate::ButtonClick(int button_index) {
+  FixSignIn();
+}
+
+std::string SigninNotificationDelegate::id() const {
+  return id_;
+}
+
+content::WebContents* SigninNotificationDelegate::GetWebContents() const {
+  return NULL;
+}
+
+void SigninNotificationDelegate::FixSignIn() {
 #if defined(OS_CHROMEOS)
   chrome::AttemptUserExit();
 #else
   LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
   if (login_ui->current_login_ui()) {
     login_ui->current_login_ui()->FocusUI();
     return;
   }
 
   // Find a browser instance or create one.
   chrome::ScopedTabbedBrowserDisplayer browser_displayer(
       profile_, chrome::HOST_DESKTOP_TYPE_ASH);
 
   // Navigate to the sync setup subpage, which will launch a login page.
   chrome::ShowSettingsSubPage(browser_displayer.browser(),
                               chrome::kSyncSetupSubPage);
 #endif
 }
 
-std::string SigninNotificationDelegate::id() const {
-  return id_;
-}
-
-content::WebContents* SigninNotificationDelegate::GetWebContents() const {
-  return NULL;
-}
-
 }  // namespace
 
 SigninErrorNotifier::SigninErrorNotifier(SigninErrorController* controller,
                                          Profile* profile)
     : error_controller_(controller),
       profile_(profile) {
   // Create a unique notification ID for this profile.
   notification_id_ = kProfileSigninNotificationId + profile->GetProfileName();
 
   error_controller_->AddObserver(this);
@@ skipping 91 matching lines @@
       return l10n_util::GetStringUTF16(
           IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE);
       break;
 
     // Generic message for "other" errors.
     default:
       return l10n_util::GetStringUTF16(
           IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE);
   }
 }