ash/accelerators/accelerator_interactive_uitest_chromeos.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/accelerators/accelerator_interactive_uitest_chromeos.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: move files, cleanup 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/accelerators/accelerator_interactive_uitest_chromeos.cc

diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

index 58d237407f2110f42a399c51569f0bfc19972fbf..c4f26d1dba99c569656db7a8b74f6db94f0c8cb8 100644

--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc

@@ -198,11 +198,11 @@ TEST_F(AcceleratorInteractiveUITest, MAYBE_ChromeOsAccelerators) {

// Tests the app list accelerator.

TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {

- EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility());

+ EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());

SendKeyPressSync(ui::VKEY_LWIN, false, false, false);

- EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility());

+ EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility());

SendKeyPressSync(ui::VKEY_LWIN, false, false, false);

- EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility());

+ EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());

}

} // namespace test

« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/app_list/app_list_presenter_delegate.cc » ('j') | ash/common/wm_shell.h » ('J')