Refactored signin/sync error controllers for the avatar button

chrome/browser/ui/avatar_button_error_controller.cc

Index: chrome/browser/ui/avatar_button_error_controller.cc
diff --git a/chrome/browser/ui/avatar_button_error_controller.cc b/chrome/browser/ui/avatar_button_error_controller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a73bf1d42b31d0c9ed444a122e128118f00d130f
--- /dev/null
+++ b/chrome/browser/ui/avatar_button_error_controller.cc
@@ -0,0 +1,108 @@
+// Copyright 2016 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/avatar_button_error_controller.h"
+
+#include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "components/browser_sync/browser/profile_sync_service.h"
+#include "components/signin/core/browser/signin_error_controller.h"
+#include "components/signin/core/common/profile_management_switches.h"
+
+AvatarButtonErrorController::AvatarButtonErrorController(
+    AvatarButtonErrorControllerDelegate* delegate,
+    Profile* profile)
+    : delegate_(delegate),
+      avatar_signin_error_controller_(profile, this),
+      avatar_sync_error_controller_(profile, this),
+      has_signin_error_(avatar_signin_error_controller_.HasSigninError()),
+      has_sync_error_(avatar_sync_error_controller_.HasSyncError()) {}
+
+AvatarButtonErrorController::~AvatarButtonErrorController() {}
+
+void AvatarButtonErrorController::UpdateSigninError(bool has_signin_error) {
+  bool had_error = HasAvatarError();
+  has_signin_error_ = has_signin_error;
+  if (had_error != HasAvatarError())
+    delegate_->OnAvatarErrorChanged();
+}
+
+void AvatarButtonErrorController::UpdateSyncError(bool has_sync_error) {
+  bool had_error = HasAvatarError();
+  has_sync_error_ = has_sync_error;
+  if (had_error != HasAvatarError())
+    delegate_->OnAvatarErrorChanged();
+}
+
+AvatarButtonErrorController::SigninErrorObserver::SigninErrorObserver(
+    Profile* profile,
+    AvatarButtonErrorController* avatar_button_error_controller)
+    : profile_(profile),
+      avatar_button_error_controller_(avatar_button_error_controller) {
+  SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  if (signin_error_controller)
+    signin_error_controller->AddObserver(this);
+}
+
+AvatarButtonErrorController::SigninErrorObserver::~SigninErrorObserver() {
+  SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  if (signin_error_controller)
+    signin_error_controller->RemoveObserver(this);
+}
+
+void AvatarButtonErrorController::SigninErrorObserver::OnErrorChanged() {
+  avatar_button_error_controller_->UpdateSigninError(HasSigninError());
+}
+
+bool AvatarButtonErrorController::SigninErrorObserver::HasSigninError() {
+  const SigninErrorController* signin_error_controller =
+      profiles::GetSigninErrorController(profile_);
+  return signin_error_controller && signin_error_controller->HasError();
+}
+
+AvatarButtonErrorController::SyncErrorObserver::SyncErrorObserver(
+    Profile* profile,
+    AvatarButtonErrorController* avatar_button_error_controller)
+    : profile_(profile),
+      avatar_button_error_controller_(avatar_button_error_controller) {
+  SyncErrorController* sync_error_controller = GetSyncErrorControllerIfNeeded();
+  if (sync_error_controller)
+    sync_error_controller->AddObserver(this);
+}
+
+AvatarButtonErrorController::SyncErrorObserver::~SyncErrorObserver() {
+  SyncErrorController* sync_error_controller = GetSyncErrorControllerIfNeeded();
+  if (sync_error_controller)
+    sync_error_controller->RemoveObserver(this);
+}
+
+void AvatarButtonErrorController::SyncErrorObserver::OnErrorChanged() {
+  avatar_button_error_controller_->UpdateSyncError(HasSyncError());
+}
+
+bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
+  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);
+    return sync_service->HasUnrecoverableError() ||
+           status.sync_protocol_error.action == syncer::UPGRADE_CLIENT ||
+           (sync_error_controller && sync_error_controller->HasError());
+  }
+  return false;
+}
+
+SyncErrorController* AvatarButtonErrorController::SyncErrorObserver::
+    GetSyncErrorControllerIfNeeded() {
+  if (!switches::IsMaterialDesignUserMenu())
+    return nullptr;
+  ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetForProfile(profile_);
+  return sync_service ? sync_service->sync_error_controller() : nullptr;
+}