ash/shell/app_list.cc - Issue 2169533002: mash: Migrate shelf app list button to wm common types

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 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 5 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/shell/app_list.cc

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

index e4a066a33b7cf868d9d267d171765e0bcaf5e8da..c9a280b0c8ff86689d006957224d14e7ceb1a209 100644

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

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

@@ -9,7 +9,6 @@

#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"

#include "base/callback.h"

@@ -304,8 +303,8 @@ class ExampleAppListViewDelegate : public app_list::AppListViewDelegate {

}

void Dismiss() override {

- DCHECK(Shell::HasInstance());

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

+ DCHECK(WmShell::HasInstance());

+ WmShell::Get()->DismissAppList();

}

void ViewClosing() override {

« no previous file with comments | « ash/shell.cc ('k') | ash/shell/window_watcher.cc » ('j') | no next file with comments »