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

Unified Diff: ash/wm/screen_pinning_controller_unittest.cc

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: fix include Created 3 years, 9 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/wm/screen_pinning_controller_unittest.cc
diff --git a/ash/wm/screen_pinning_controller_unittest.cc b/ash/wm/screen_pinning_controller_unittest.cc
index 590f4941c1cc7a7e035bf87c265e5c06a8582c27..9c613b07ed178b1cd0e3e7422fded8298bf82ccc 100644
--- a/ash/wm/screen_pinning_controller_unittest.cc
+++ b/ash/wm/screen_pinning_controller_unittest.cc
@@ -11,6 +11,7 @@
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
+#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_util.h"
#include "base/stl_util.h"
@@ -159,7 +160,7 @@ TEST_F(ScreenPinningControllerTest, TrustedPinnedWithAccelerator) {
wm::PinWindow(w1, /* trusted */ true);
EXPECT_TRUE(WmShell::Get()->IsPinned());
- WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(UNPIN);
+ Shell::Get()->accelerator_controller()->PerformActionIfEnabled(UNPIN);
// The UNPIN accelerator key is disabled for trusted pinned and the window
// must be still pinned.
EXPECT_TRUE(WmShell::Get()->IsPinned());
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698