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

Unified Diff: ash/common/system/chromeos/settings/tray_settings.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change 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
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/settings/tray_settings.cc
diff --git a/ash/common/system/chromeos/settings/tray_settings.cc b/ash/common/system/chromeos/settings/tray_settings.cc
index 4b613ffc97878ea70cf4ed2cc4a484ad146037de..933164a0a2bae6f3dabd29f1ca587ce3eb3d1c1f 100644
--- a/ash/common/system/chromeos/settings/tray_settings.cc
+++ b/ash/common/system/chromeos/settings/tray_settings.cc
@@ -5,7 +5,7 @@
#include "ash/common/system/chromeos/settings/tray_settings.h"
#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/chromeos/power/power_status_view.h"
#include "ash/common/system/tray/actionable_view.h"
@@ -49,9 +49,7 @@ class SettingsDefaultView : public ActionableView,
bool power_view_right_align = false;
if (login_status_ != LoginStatus::NOT_LOGGED_IN &&
login_status_ != LoginStatus::LOCKED &&
- !WmShell::Get()
- ->GetSessionStateDelegate()
- ->IsInSecondaryLoginScreen()) {
+ !WmShell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
views::ImageView* icon = TrayPopupUtils::CreateMainImageView();
@@ -85,7 +83,7 @@ class SettingsDefaultView : public ActionableView,
bool PerformAction(const ui::Event& event) override {
if (login_status_ == LoginStatus::NOT_LOGGED_IN ||
login_status_ == LoginStatus::LOCKED ||
- WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
+ WmShell::Get()->session_controller()->IsInSecondaryLoginScreen()) {
return false;
}
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698