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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

Issue 2619083002: Clean up SessionStateDelegate in chrome (Closed)
Patch Set: fix LauncherContextMenuTest Created 3 years, 11 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/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index aa70210eac001e319a02822122bc7a2959a8aa76..80db26fe2ff1926a6f8ff48a1752200038b552f7 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/strings/grit/ash_strings.h"
@@ -26,6 +25,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/prefs/pref_service.h"
+#include "components/session_manager/core/session_manager.h"
#include "content/public/common/context_menu_params.h"
#if defined(OS_CHROMEOS)
@@ -190,7 +190,7 @@ void LauncherContextMenu::AddShelfOptionsMenu() {
IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
}
if (ash::WmShelf::CanChangeShelfAlignment() &&
- !ash::WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked()) {
+ !session_manager::SessionManager::Get()->IsScreenLocked()) {
AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
IDS_ASH_SHELF_CONTEXT_MENU_POSITION,
&shelf_alignment_menu_);

Powered by Google App Engine
This is Rietveld 408576698