Shuffles and renames ash/common/wm classes

ash/desktop_background/desktop_background_widget_controller.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/desktop_background/desktop_background_widget_controller.h"
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_lookup.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_window.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ skipping 43 matching lines @@
   const bool is_initial_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(ShowWallpaperAnimationObserver);
 };
 
 }  // namespace
 
 DesktopBackgroundWidgetController::DesktopBackgroundWidgetController(
     views::Widget* widget)
     : widget_(widget),
-      widget_parent_(
-          wm::WmLookup::Get()->GetWindowForWidget(widget)->GetParent()) {
+      widget_parent_(WmLookup::Get()->GetWindowForWidget(widget)->GetParent()) {
   DCHECK(widget_);
   widget_->AddObserver(this);
   widget_parent_->AddObserver(this);
 }
 
 DesktopBackgroundWidgetController::~DesktopBackgroundWidgetController() {
   if (widget_) {
     views::Widget* widget = widget_;
     RemoveObservers();
     widget->CloseNow();
@@ skipping 10 matching lines @@
     widget_->SetBounds(bounds);
 }
 
 bool DesktopBackgroundWidgetController::Reparent(aura::Window* root_window,
                                                  int src_container,
                                                  int dest_container) {
   if (widget_) {
     widget_parent_->RemoveObserver(this);
     views::Widget::ReparentNativeView(widget_->GetNativeView(),
         root_window->GetChildById(dest_container));
-    widget_parent_ =
-        wm::WmLookup::Get()->GetWindowForWidget(widget_)->GetParent();
+    widget_parent_ = WmLookup::Get()->GetWindowForWidget(widget_)->GetParent();
     widget_parent_->AddObserver(this);
     return true;
   }
   // Nothing to reparent.
   return false;
 }
 
 void DesktopBackgroundWidgetController::RemoveObservers() {
   widget_parent_->RemoveObserver(this);
   widget_->RemoveObserver(this);
   widget_ = nullptr;
 }
 
 void DesktopBackgroundWidgetController::OnWindowBoundsChanged(
-    wm::WmWindow* window,
+    WmWindow* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   SetBounds(new_bounds);
 }
 
 void DesktopBackgroundWidgetController::StartAnimating(
     RootWindowController* root_window_controller) {
   if (widget_) {
     ui::ScopedLayerAnimationSettings settings(
         widget_->GetNativeView()->layer()->GetAnimator());
@@ skipping 25 matching lines @@
 }
 
 DesktopBackgroundWidgetController* AnimatingDesktopController::GetController(
     bool pass_ownership) {
   if (pass_ownership)
     return controller_.release();
   return controller_.get();
 }
 
 }  // namespace ash