ash/test/shell_test_api.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/test/shell_test_api.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/test/shell_test_api.cc

diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc

index f64bc305d958d2e8d23d6510d366e0f9f2973f4b..457d201f97d5f0fb2dfa3cf7075a32c0b4635eec 100644

--- a/ash/test/shell_test_api.cc

+++ b/ash/test/shell_test_api.cc

@@ -34,7 +34,8 @@ AshNativeCursorManager* ShellTestApi::ash_native_cursor_manager() {

}

ShelfModel* ShellTestApi::shelf_model() {

- return shell_->shelf_model_.get();

+ // TODO(jamescook): Remove this and access WmShell::shelf_model() directly.

+ return shell_->wm_shell_->shelf_model();

}

DragDropController* ShellTestApi::drag_drop_controller() {

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