Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1876)

Unified Diff: ash/accelerators/accelerator_filter_unittest.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/accelerators/accelerator_filter_unittest.cc
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
index 2a0de7aea8a494a7e8d779ac0f7bfa08172afd88..fcbf05d34977419c3728443c2f14d87b8c647923 100644
--- a/ash/accelerators/accelerator_filter_unittest.cc
+++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -10,6 +10,7 @@
#include "ash/accelerators/accelerator_delegate.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
@@ -151,8 +152,8 @@ TEST_F(AcceleratorFilterTest, SearchKeyShortcutsAreAlwaysHandled) {
EXPECT_FALSE(session_state_delegate->IsScreenLocked());
// Search+L is processed when the app_list target visibility is false.
- Shell::GetInstance()->DismissAppList();
- EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility());
+ WmShell::Get()->DismissAppList();
+ EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility());
generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
EXPECT_TRUE(session_state_delegate->IsScreenLocked());
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/accelerators/accelerator_interactive_uitest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698