Refactored signin/sync error controllers for the avatar button

chrome/browser/ui/views/profiles/new_avatar_button.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_
 
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
+#include "chrome/browser/sync/avatar_sync_error.h"
 #include "chrome/browser/ui/views/profiles/avatar_button_style.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/sync_driver/sync_error_controller.h"
 #include "ui/views/controls/button/label_button.h"
 
 class AvatarButtonDelegate;
 class Profile;
 
 // Avatar button that displays the active profile's name in the caption area.
 class NewAvatarButton : public views::LabelButton,
                         public ProfileAttributesStorage::Observer {
  public:
+  class AvatarSyncErrorObserver : public AvatarSyncError {
+   public:
+    AvatarSyncErrorObserver(Profile* profile, NewAvatarButton* parent_button);
+    void OnErrorChanged() override;
+
+   private:
+    NewAvatarButton* parent_button_;
+  };
+
   class SigninErrorObserver : public SigninErrorController::Observer {
    public:
     SigninErrorObserver(NewAvatarButton* parent_button, Profile* profile);
     ~SigninErrorObserver() override;
 
    private:
     // SigninErrorController::Observer:
     void OnErrorChanged() override;
 
     NewAvatarButton* parent_button_;
     Profile* profile_;
 
     DISALLOW_COPY_AND_ASSIGN(SigninErrorObserver);
   };
 
-  class SyncErrorObserver : public SyncErrorController::Observer {
-   public:
-    SyncErrorObserver(NewAvatarButton* parent_button, Profile* profile);
-    ~SyncErrorObserver() override;
-
-   private:
-    // SyncErrorController::Observer:
-    void OnErrorChanged() override;
-
-    NewAvatarButton* parent_button_;
-    Profile* profile_;
-
-    DISALLOW_COPY_AND_ASSIGN(SyncErrorObserver);
-  };
-
   NewAvatarButton(AvatarButtonDelegate* delegate,
                   AvatarButtonStyle button_style,
                   Profile* profile);
   ~NewAvatarButton() override;
 
   // Views::LabelButton
   bool OnMousePressed(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
 
   // Views
@@ skipping 11 matching lines @@
   void OnProfileNameChanged(const base::FilePath& profile_path,
                             const base::string16& old_profile_name) override;
   void OnProfileSupervisedUserIdChanged(
       const base::FilePath& profile_path) override;
 
   // Called when the profile info cache has changed, which means we might
   // have to update the icon/text of the button.
   void Update();
 
   SigninErrorObserver signin_error_observer_;
-  SyncErrorObserver sync_error_observer_;
+  AvatarSyncErrorObserver avatar_sync_error_;
 
   AvatarButtonDelegate* delegate_;
   Profile* profile_;
 
   // Whether the signed in profile has any authentication error or sync error.
   // Used to display an error icon next to the button text.
-  bool has_error_;
+  bool has_signin_error_;
+  bool has_sync_error_;

[Roger Tawa OOO till Jul 10th, 2016/07/26 14:34:24]

I don't think you need this member anymore.  Anywhere where you accessed
|has_sync_error_|, you can now access |avatar_sync_error_.has_error()|

[Jane, 2016/07/26 17:31:17]

Done.

 
   // The icon displayed instead of the profile name in the local profile case.
   // Different assets are used depending on the OS version.
   gfx::ImageSkia generic_avatar_;
 
   // This is used to check if the bubble was showing during the mouse pressed
   // event. If this is true then the mouse released event is ignored to prevent
   // the bubble from reshowing.
   bool suppress_mouse_released_action_;
 
   DISALLOW_COPY_AND_ASSIGN(NewAvatarButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_