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

Unified Diff: ash/wm/workspace/workspace_event_handler_unittest.cc

Issue 114643003: Use a single ToplevelWindowEventHandler for the ash::Shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/workspace/workspace_event_handler_unittest.cc
diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc
index feec4bdbc6b3d4037d12aaadf9a8be8129cf4de4..fba315c59b24f91cae60a0cd1ef402ed0ee1cc1e 100644
--- a/ash/wm/workspace/workspace_event_handler_unittest.cc
+++ b/ash/wm/workspace/workspace_event_handler_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/wm/workspace_controller.h"
#include "ash/wm/workspace_controller_test_helper.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/window_move_client.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_window_delegate.h"
@@ -336,9 +337,9 @@ TEST_F(WorkspaceEventHandlerTest, DeleteWhileInRunLoop) {
scoped_ptr<aura::Window> window(CreateTestWindow(&wd, bounds));
wd.set_window_component(HTCAPTION);
- ASSERT_TRUE(aura::client::GetWindowMoveClient(window->parent()));
+ ASSERT_TRUE(aura::client::GetWindowMoveClient(window->GetRootWindow()));
base::MessageLoop::current()->DeleteSoon(FROM_HERE, window.get());
- aura::client::GetWindowMoveClient(window->parent())
+ aura::client::GetWindowMoveClient(window->GetRootWindow())
->RunMoveLoop(window.release(),
gfx::Vector2d(),
aura::client::WINDOW_MOVE_SOURCE_MOUSE);

Powered by Google App Engine
This is Rietveld 408576698