Revamped signin/sync error surfacing on desktop user menu

chrome/browser/ui/views/profiles/new_avatar_button.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/ui/views/profiles/new_avatar_button.h"
 
 #include <utility>
 
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/views/profiles/avatar_button_delegate.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
+#include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button_border.h"
@@ skipping 17 matching lines @@
   const int kTopInset = 2;
   const int kBottomInset = 4;
   border->set_insets(gfx::Insets(kTopInset, kLeftRightInset,
                                  kBottomInset, kLeftRightInset));
 
   return std::move(border);
 }
 
 }  // namespace
 
+SyncErrorController* GetSyncErrorControllerIfNeeded(Profile* profile) {
+  if (!switches::IsMaterialDesignUserMenu())
+    return nullptr;
+  ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetForProfile(profile);
+  return sync_service ? sync_service->sync_error_controller() : nullptr;
+}
+
+NewAvatarButton::SigninErrorObserver::SigninErrorObserver(
+    NewAvatarButton* parent_button,
+    Profile* profile)
+    : parent_button_(parent_button), profile_(profile) {
+  // Subscribe to authentication error changes so that the avatar button can
+  // update itself.  Note that guest mode profiles won't have a token service.
+  SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  if (signin_error_controller)
+    signin_error_controller->AddObserver(this);
+}
+
+NewAvatarButton::SigninErrorObserver::~SigninErrorObserver() {
+  SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  if (signin_error_controller)
+    signin_error_controller->RemoveObserver(this);
+}
+
+void NewAvatarButton::SigninErrorObserver::OnErrorChanged() {
+  parent_button_->OnErrorChanged();
+}
+
+NewAvatarButton::SyncErrorObserver::SyncErrorObserver(
+    NewAvatarButton* parent_button,
+    Profile* profile)
+    : parent_button_(parent_button), profile_(profile) {
+  SyncErrorController* sync_error_controller =
+      GetSyncErrorControllerIfNeeded(profile_);
+  if (sync_error_controller)
+    sync_error_controller->AddObserver(this);
+}
+
+NewAvatarButton::SyncErrorObserver::~SyncErrorObserver() {
+  SyncErrorController* sync_error_controller =
+      GetSyncErrorControllerIfNeeded(profile_);
+  if (sync_error_controller)
+    sync_error_controller->RemoveObserver(this);
+}
+
+void NewAvatarButton::SyncErrorObserver::OnErrorChanged() {
+  parent_button_->OnErrorChanged();
+}
+
 NewAvatarButton::NewAvatarButton(AvatarButtonDelegate* delegate,
                                  AvatarButtonStyle button_style,
                                  Profile* profile)
     : LabelButton(delegate, base::string16()),
+      signin_error_observer_(new SigninErrorObserver(this, profile)),
+      sync_error_observer_(switches::IsMaterialDesignUserMenu()
+                               ? new SyncErrorObserver(this, profile)
+                               : nullptr),
       delegate_(delegate),
       profile_(profile),
-      has_auth_error_(false),
+      has_error_(false),
       suppress_mouse_released_action_(false) {
   set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   set_animate_on_state_change(false);
   SetEnabledTextColors(SK_ColorWHITE);
   SetTextSubpixelRenderingEnabled(false);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
 
   // The largest text height that fits in the button. If the font list height
   // is larger than this, it will be shrunk to match it.
@@ skipping 26 matching lines @@
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_NATIVE_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     generic_avatar_ =
         *rb->GetImageNamed(IDR_AVATAR_NATIVE_BUTTON_AVATAR).ToImageSkia();
   }
 
   g_browser_process->profile_manager()->
       GetProfileAttributesStorage().AddObserver(this);
 
-  // Subscribe to authentication error changes so that the avatar button can
-  // update itself.  Note that guest mode profiles won't have a token service.
-  SigninErrorController* error = profiles::GetSigninErrorController(profile_);
-  if (error) {
-    error->AddObserver(this);
-    OnErrorChanged();  // This calls Update().
+  SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  SyncErrorController* sync_error_controller =
+      GetSyncErrorControllerIfNeeded(profile_);
+  if (signin_error_controller || sync_error_controller) {
+    OnErrorChanged();  // This calls Update()

[msw, 2016/07/14 17:47:52]

nit: Just always call OnErrorChanged here and remove the checks and alternative
call to Update. (OnErrorChanged does the right thing either way).

[Jane, 2016/07/14 17:59:44]

Done.

   } else {
     Update();
   }
   SchedulePaint();
 }
 
 NewAvatarButton::~NewAvatarButton() {
   g_browser_process->profile_manager()->
       GetProfileAttributesStorage().RemoveObserver(this);
-  SigninErrorController* error =
-      profiles::GetSigninErrorController(profile_);
-  if (error)
-    error->RemoveObserver(this);
 }
 
 bool NewAvatarButton::OnMousePressed(const ui::MouseEvent& event) {
   // Prevent the bubble from being re-shown if it's already showing.
   suppress_mouse_released_action_ = ProfileChooserView::IsShowing();
   return LabelButton::OnMousePressed(event);
 }
 
 void NewAvatarButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (suppress_mouse_released_action_)
     suppress_mouse_released_action_ = false;
   else
     LabelButton::OnMouseReleased(event);
 }
 
 void NewAvatarButton::OnGestureEvent(ui::GestureEvent* event) {
   // TODO(wjmaclean): The check for ET_GESTURE_LONG_PRESS is done here since
   // no other UI button based on CustomButton appears to handle mouse
   // right-click. If other cases are identified, it may make sense to move this
   // check to CustomButton.
   if (event->type() == ui::ET_GESTURE_LONG_PRESS)
     NotifyClick(*event);
   else
     LabelButton::OnGestureEvent(event);
 }
 
+void NewAvatarButton::OnErrorChanged() {
+  // If there is a signin error, show a warning icon.
+  const SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  has_error_ = signin_error_controller && signin_error_controller->HasError();
+
+  // Also show a warning icon for sync errors for the material design user menu.
+  ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetForProfile(profile_);
+  if (switches::IsMaterialDesignUserMenu() && sync_service) {
+    SyncErrorController* sync_error_controller =
+        sync_service->sync_error_controller();
+    ProfileSyncService::Status status;
+    sync_service->QueryDetailedSyncStatus(&status);
+    has_error_ |=
+        (sync_service->HasUnrecoverableError() ||
+         status.sync_protocol_error.action == syncer::UPGRADE_CLIENT ||
+         (sync_error_controller && sync_error_controller->HasError()));
+  }
+
+  Update();
+}
+
 void NewAvatarButton::OnProfileAdded(const base::FilePath& profile_path) {
   Update();
 }
 
 void NewAvatarButton::OnProfileWasRemoved(
       const base::FilePath& profile_path,
       const base::string16& profile_name) {
   // If deleting the active profile, don't bother updating the avatar
   // button, as the browser window is being closed anyway.
   if (profile_->GetPath() != profile_path)
     Update();
 }
 
 void NewAvatarButton::OnProfileNameChanged(
       const base::FilePath& profile_path,
       const base::string16& old_profile_name) {
   if (profile_->GetPath() == profile_path)
     Update();
 }
 
 void NewAvatarButton::OnProfileSupervisedUserIdChanged(
       const base::FilePath& profile_path) {
   if (profile_->GetPath() == profile_path)
     Update();
 }
 
-void NewAvatarButton::OnErrorChanged() {
-  // If there is an error, show an warning icon.
-  const SigninErrorController* error =
-      profiles::GetSigninErrorController(profile_);
-  has_auth_error_ = error && error->HasError();
-
-  Update();
-}
-
 void NewAvatarButton::Update() {
   ProfileAttributesStorage& storage =
       g_browser_process->profile_manager()->GetProfileAttributesStorage();
 
   // If we have a single local profile, then use the generic avatar
   // button instead of the profile name. Never use the generic button if
   // the active profile is Guest.
   const bool use_generic_button =
       !profile_->IsGuestSession() &&
       storage.GetNumberOfProfiles() == 1 &&
       !storage.GetAllProfilesAttributes().front()->IsAuthenticated();
 
   SetText(use_generic_button
               ? base::string16()
               : profiles::GetAvatarButtonTextForProfile(profile_));
 
   // If the button has no text, clear the text shadows to make sure the
   // image is centered correctly.
   SetTextShadows(
       use_generic_button
           ? gfx::ShadowValues()
           : gfx::ShadowValues(
                 10, gfx::ShadowValue(gfx::Vector2d(), 1.0f, SK_ColorDKGRAY)));
 
   // We want the button to resize if the new text is shorter.
   SetMinSize(gfx::Size());
 
   if (use_generic_button) {
     SetImage(views::Button::STATE_NORMAL, generic_avatar_);
-  } else if (has_auth_error_) {
+  } else if (has_error_) {
     if (switches::IsMaterialDesignUserMenu()) {
       SetImage(views::Button::STATE_NORMAL,
                gfx::CreateVectorIcon(gfx::VectorIconId::SYNC_PROBLEM, 13,
                                      gfx::kGoogleRed700));
     } else {
       SetImage(views::Button::STATE_NORMAL,
                gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 13,
                                      gfx::kGoogleYellow700));
     }
   } else {
     SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia());
   }
 
   // If we are not using the generic button, then reset the spacing between
   // the text and the possible authentication error icon.
   const int kDefaultImageTextSpacing = 5;
   SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing);
 
   PreferredSizeChanged();
   delegate_->ButtonPreferredSizeChanged();
 }