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

Unified Diff: ash/system/tiles/tiles_default_view.cc

Issue 2822033002: cros: Use SessionController to enable system tray settings / notifications tray (Closed)
Patch Set: Created 3 years, 8 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: ash/system/tiles/tiles_default_view.cc
diff --git a/ash/system/tiles/tiles_default_view.cc b/ash/system/tiles/tiles_default_view.cc
index 52bf8c10db97b31381d5f80e40e29e0c182aa234..216d1b7c43708536c54006dde45196e876674b2c 100644
--- a/ash/system/tiles/tiles_default_view.cc
+++ b/ash/system/tiles/tiles_default_view.cc
@@ -14,7 +14,6 @@
#include "ash/system/tray/system_menu_button.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_controller.h"
-#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_popup_utils.h"
@@ -66,7 +65,7 @@ void TilesDefaultView::Init() {
this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuSettingsIcon,
IDS_ASH_STATUS_TRAY_SETTINGS);
if (disable_buttons ||
- !Shell::Get()->system_tray_delegate()->ShouldShowSettings())
+ !Shell::Get()->session_controller()->ShouldEnableSettings())
settings_button_->SetEnabled(false);
AddChildView(settings_button_);
AddChildView(TrayPopupUtils::CreateVerticalSeparator());

Powered by Google App Engine
This is Rietveld 408576698