ash/shelf/shelf_layout_manager_unittest.cc - Issue 2170753005: Moves AcceleratorController from Shell 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/shelf/shelf_layout_manager_unittest.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: include 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:

Index: ash/shelf/shelf_layout_manager_unittest.cc

diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc

index d29a30e7c191e724e602a142160f10df9cc1500f..9832b132ed1d41929d976c171cdef2b017a2751b 100644

--- a/ash/shelf/shelf_layout_manager_unittest.cc

+++ b/ash/shelf/shelf_layout_manager_unittest.cc

@@ -2007,7 +2007,7 @@ TEST_F(ShelfLayoutManagerTest, ShelfFlickerOnTrayActivation) {

EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());

// Show the status menu. That should make the shelf visible again.

- Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(

+ WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(

SHOW_SYSTEM_TRAY_BUBBLE);

EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());

EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());

« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.h » ('j') | no next file with comments »