summaryrefslogtreecommitdiffstats
path: root/ash/wm/toplevel_window_event_handler_unittest.cc
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 05:45:31 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 05:45:31 +0000
commit3537d47b8e8f842d1c83a739e353ee9b97ee436f (patch)
treec7cfcace93e3c5e6b4db1f748e29d3188d28a375 /ash/wm/toplevel_window_event_handler_unittest.cc
parentc267f8362843a0d5ba47952f2ccd59bc3363e7ea (diff)
downloadchromium_src-3537d47b8e8f842d1c83a739e353ee9b97ee436f.zip
chromium_src-3537d47b8e8f842d1c83a739e353ee9b97ee436f.tar.gz
chromium_src-3537d47b8e8f842d1c83a739e353ee9b97ee436f.tar.bz2
Use a single ToplevelWindowEventHandler for the ash::Shell. This is part 1 in disabling the few cases in which dragging multiple windows is possible (which causes crashiness)
BUG=324038 TEST=None R=oshima TBR=sadrul (This is a reland of https://codereview.chromium.org/114643003) Review URL: https://codereview.chromium.org/102253008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/toplevel_window_event_handler_unittest.cc')
-rw-r--r--ash/wm/toplevel_window_event_handler_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc
index d048529..b677b76 100644
--- a/ash/wm/toplevel_window_event_handler_unittest.cc
+++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -708,7 +708,7 @@ TEST_F(ToplevelWindowEventHandlerTest, RunMoveLoopRevertsInProgressDrag) {
EXPECT_NE(window1_initial_bounds.ToString(), window1->bounds().ToString());
aura::client::WindowMoveClient* move_client =
- aura::client::GetWindowMoveClient(window2->parent());
+ aura::client::GetWindowMoveClient(window2->GetRootWindow());
base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&aura::client::WindowMoveClient::EndMoveLoop,