Shuffles and renames ash/common/wm classes

ash/wm/toplevel_window_event_handler.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 "ash/wm/toplevel_window_event_handler.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 
 namespace ash {
 
-ToplevelWindowEventHandler::ToplevelWindowEventHandler(wm::WmGlobals* globals)
-    : wm_toplevel_window_event_handler_(globals), weak_factory_(this) {}
+ToplevelWindowEventHandler::ToplevelWindowEventHandler(WmShell* shell)
+    : wm_toplevel_window_event_handler_(shell), weak_factory_(this) {}
 
 ToplevelWindowEventHandler::~ToplevelWindowEventHandler() {}
 
 void ToplevelWindowEventHandler::OnKeyEvent(ui::KeyEvent* event) {
   wm_toplevel_window_event_handler_.OnKeyEvent(event);
 }
 
 void ToplevelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   wm_toplevel_window_event_handler_.OnMouseEvent(event,
-                                                 wm::WmWindowAura::Get(target));
+                                                 WmWindowAura::Get(target));
 }
 
 void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
-  wm_toplevel_window_event_handler_.OnGestureEvent(
-      event, wm::WmWindowAura::Get(target));
+  wm_toplevel_window_event_handler_.OnGestureEvent(event,
+                                                   WmWindowAura::Get(target));
 }
 
 aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
     aura::Window* source,
     const gfx::Vector2d& drag_offset,
     aura::client::WindowMoveSource move_source) {
   DCHECK(!in_move_loop_);  // Can only handle one nested loop at a time.
   aura::Window* root_window = source->GetRootWindow();
   DCHECK(root_window);
   gfx::Point drag_location;
@@ skipping 15 matching lines @@
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window);
   if (cursor_client)
     cursor_client->SetCursor(ui::kCursorPointer);
 
   base::RunLoop run_loop;
 
   wm::WmToplevelWindowEventHandler::DragResult result =
       wm::WmToplevelWindowEventHandler::DragResult::SUCCESS;
   if (!wm_toplevel_window_event_handler_.AttemptToStartDrag(
-          wm::WmWindowAura::Get(source), drag_location, HTCAPTION, move_source,
+          WmWindowAura::Get(source), drag_location, HTCAPTION, move_source,
           base::Bind(&ToplevelWindowEventHandler::OnDragCompleted,
                      weak_factory_.GetWeakPtr(), &result, &run_loop))) {
     return aura::client::MOVE_CANCELED;
   }
 
   in_move_loop_ = true;
   base::WeakPtr<ToplevelWindowEventHandler> weak_ptr(
       weak_factory_.GetWeakPtr());
   base::MessageLoop* loop = base::MessageLoop::current();
   base::MessageLoop::ScopedNestableTaskAllower allow_nested(loop);
@@ skipping 16 matching lines @@
 
 void ToplevelWindowEventHandler::OnDragCompleted(
     wm::WmToplevelWindowEventHandler::DragResult* result_return_value,
     base::RunLoop* run_loop,
     wm::WmToplevelWindowEventHandler::DragResult result) {
   *result_return_value = result;
   run_loop->Quit();
 }
 
 }  // namespace ash