Shuffles and renames ash/common/wm classes

ash/autoclick/autoclick_controller.cc

 // Copyright 2013 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/autoclick/autoclick_controller.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "base/timer/timer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/vector2d.h"
@@ skipping 153 matching lines @@
 }
 
 void AutoclickControllerImpl::OnScrollEvent(ui::ScrollEvent* event) {
   autoclick_timer_->Stop();
 }
 
 void AutoclickControllerImpl::DoAutoclick() {
   gfx::Point screen_location =
       aura::Env::GetInstance()->last_mouse_location();
   aura::Window* root_window =
-      wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(screen_location));
+      WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(screen_location));
   DCHECK(root_window) << "Root window not found while attempting autoclick.";
 
   gfx::Point click_location(screen_location);
   anchor_location_ = click_location;
 
   ::wm::ConvertPointFromScreen(root_window, &click_location);
   aura::WindowTreeHost* host = root_window->GetHost();
   host->ConvertPointToHost(&click_location);
 
   ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, click_location,
@@ skipping 12 matching lines @@
   if (details.dispatcher_destroyed)
     return;
 }
 
 // static.
 AutoclickController* AutoclickController::CreateInstance() {
   return new AutoclickControllerImpl();
 }
 
 }  // namespace ash