Use a single ToplevelWindowEventHandler for the ash::Shell

ui/views/widget/native_widget_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 630 matching lines @@
   return gfx::Screen::GetScreenFor(window_)->
       GetDisplayNearestWindow(window_).work_area();
 }
 
 Widget::MoveLoopResult NativeWidgetAura::RunMoveLoop(
     const gfx::Vector2d& drag_offset,
     Widget::MoveLoopSource source,
     Widget::MoveLoopEscapeBehavior escape_behavior) {
   // |escape_behavior| is only needed on windows when running the native message
   // loop.
-  if (window_ && window_->parent() &&
-      aura::client::GetWindowMoveClient(window_->parent())) {
-    SetCapture();
-    aura::client::WindowMoveSource window_move_source =
-        source == Widget::MOVE_LOOP_SOURCE_MOUSE ?
-        aura::client::WINDOW_MOVE_SOURCE_MOUSE :
-        aura::client::WINDOW_MOVE_SOURCE_TOUCH;
-    if (aura::client::GetWindowMoveClient(window_->parent())->RunMoveLoop(
-            window_, drag_offset, window_move_source) ==
-        aura::client::MOVE_SUCCESSFUL) {
-      return Widget::MOVE_LOOP_SUCCESSFUL;
-    }
+  if (!window_ || !window_->GetRootWindow())
+    return Widget::MOVE_LOOP_CANCELED;
+  aura::client::WindowMoveClient* move_client =
+      aura::client::GetWindowMoveClient(window_->GetRootWindow());
+  if (!move_client)
+    return Widget::MOVE_LOOP_CANCELED;
+
+  SetCapture();
+  aura::client::WindowMoveSource window_move_source =
+      source == Widget::MOVE_LOOP_SOURCE_MOUSE ?
+      aura::client::WINDOW_MOVE_SOURCE_MOUSE :
+      aura::client::WINDOW_MOVE_SOURCE_TOUCH;
+  if (move_client->RunMoveLoop(window_, drag_offset, window_move_source) ==
+          aura::client::MOVE_SUCCESSFUL) {
+    return Widget::MOVE_LOOP_SUCCESSFUL;
   }
   return Widget::MOVE_LOOP_CANCELED;
 }
 
 void NativeWidgetAura::EndMoveLoop() {
-  if (window_ && window_->parent() &&
-      aura::client::GetWindowMoveClient(window_->parent())) {
-    aura::client::GetWindowMoveClient(window_->parent())->EndMoveLoop();
-  }
+  if (!window_ || !window_->GetRootWindow())
+    return;
+  aura::client::WindowMoveClient* move_client =
+      aura::client::GetWindowMoveClient(window_->GetRootWindow());
+  if (move_client)
+    move_client->EndMoveLoop();
 }
 
 void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) {
   if (window_)
     window_->SetProperty(aura::client::kAnimationsDisabledKey, !value);
 }
 
 ui::NativeTheme* NativeWidgetAura::GetNativeTheme() const {
 #if !defined(OS_CHROMEOS)
   return DesktopRootWindowHost::GetNativeTheme(window_);
@@ skipping 461 matching lines @@
   return aura::Env::GetInstance()->IsMouseButtonDown();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views