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

Unified Diff: ash/wm/always_on_top_controller_unittest.cc

Issue 2861243003: chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager (Closed)
Patch Set: feedback Created 3 years, 7 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
« no previous file with comments | « ash/wm/always_on_top_controller.cc ('k') | ash/wm/fullscreen_window_finder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/always_on_top_controller_unittest.cc
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc
index ccff5c731b4b6b232f84e983475a15ca30b980b3..db3affd43685e7b64da789ce983191f668e2aae2 100644
--- a/ash/wm/always_on_top_controller_unittest.cc
+++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -37,7 +37,7 @@ class VirtualKeyboardAlwaysOnTopControllerTest : public AshTestBase {
class TestLayoutManager : public WorkspaceLayoutManager {
public:
- explicit TestLayoutManager(WmWindow* window)
+ explicit TestLayoutManager(aura::Window* window)
: WorkspaceLayoutManager(window), keyboard_bounds_changed_(false) {}
~TestLayoutManager() override {}
@@ -63,8 +63,7 @@ TEST_F(VirtualKeyboardAlwaysOnTopControllerTest, NotifyKeyboardBoundsChanged) {
aura::Window* always_on_top_container =
Shell::GetContainer(root_window, kShellWindowId_AlwaysOnTopContainer);
// Install test layout manager.
- TestLayoutManager* manager =
- new TestLayoutManager(WmWindow::Get(always_on_top_container));
+ TestLayoutManager* manager = new TestLayoutManager(always_on_top_container);
RootWindowController* controller = Shell::GetPrimaryRootWindowController();
// Deactivates keyboard to unregister existing listeners.
controller->DeactivateKeyboard(keyboard_controller);
« no previous file with comments | « ash/wm/always_on_top_controller.cc ('k') | ash/wm/fullscreen_window_finder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698