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

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

Issue 2708073002: Removing pre-material design menu setting. (Closed)
Patch Set: Fixing tests 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..a80c5d4ef6307b1f4e7adff98478fd55a6068bde 100644
--- a/chrome/browser/ui/avatar_button_error_controller.cc
+++ b/chrome/browser/ui/avatar_button_error_controller.cc
@@ -88,7 +88,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 +102,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