Removing pre-material design menu setting.

chrome/browser/ui/avatar_button_error_controller.cc

 // 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/profile_sync_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/common/profile_management_switches.h"

[sky, 2017/03/06 18:50:40]

Is this still needed?

[jlebel, 2017/03/06 22:36:24]

Done.

 
 using syncer::SyncErrorController;
 
 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()),
@@ skipping 59 matching lines @@
     sync_error_controller->RemoveObserver(this);
 }
 
 void AvatarButtonErrorController::SyncErrorObserver::OnErrorChanged() {
   avatar_button_error_controller_->UpdateSyncError(HasSyncError());
 }
 
 bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
   browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
-  if (switches::IsMaterialDesignUserMenu() && sync_service) {
+  if (sync_service) {
     SyncErrorController* sync_error_controller =
         sync_service->sync_error_controller();
     browser_sync::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;
   browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   return sync_service ? sync_service->sync_error_controller() : nullptr;
 }