Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1631)

Unified Diff: chrome/browser/ui/avatar_button_error_controller.cc

Issue 2708073002: Removing pre-material design menu setting. (Closed)
Patch Set: Removing header Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
index 647ba4353b459add54a4f9e10346acb8e0e78f5d..b4a0ff4562488cefe331beab416fbf29dc2e1999 100644
--- a/chrome/browser/ui/avatar_button_error_controller.cc
+++ b/chrome/browser/ui/avatar_button_error_controller.cc
@@ -8,7 +8,6 @@
#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"
using syncer::SyncErrorController;
@@ -88,7 +87,7 @@ void AvatarButtonErrorController::SyncErrorObserver::OnErrorChanged() {
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;
@@ -102,8 +101,6 @@ bool AvatarButtonErrorController::SyncErrorObserver::HasSyncError() {
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;
« no previous file with comments | « chrome/browser/sync/sync_global_error_unittest.cc ('k') | chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698