ash/shell/app_list.cc - Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell/app_list.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 6 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/shelf/shelf_widget.cc ('k') | ash/shell/lock_view.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/shell/app_list.cc

diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc

index 689e3e2613edce3918bdf55060862227aa792b6e..f180b3b1b4c4a0b3fa4bf968aad0d8d5ef99008b 100644

--- a/ash/shell/app_list.cc

+++ b/ash/shell/app_list.cc

@@ -8,6 +8,7 @@

#include <vector>

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/shell/example_factory.h"

#include "ash/shell/toplevel_window.h"

@@ -112,7 +113,7 @@ class WindowTypeShelfItem : public app_list::AppListItem {

break;

}

case LOCK_SCREEN: {

- Shell::GetInstance()->session_state_delegate()->LockScreen();

+ WmShell::Get()->GetSessionStateDelegate()->LockScreen();

break;

}

case WIDGETS_WINDOW: {

@@ -304,7 +305,7 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {

}

void Dismiss() override {

- DCHECK(ash::Shell::HasInstance());

+ DCHECK(Shell::HasInstance());

Shell::GetInstance()->DismissAppList();

}

« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shell/lock_view.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')