Shuffles and renames ash/common/wm classes

ash/desktop_background/desktop_background_widget_controller.h

 // 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.
 
 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_WIDGET_CONTROLLER_H_
 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_WIDGET_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_window_observer.h"
+#include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ash {
 class RootWindowController;
 
 // This class implements a widget-based wallpaper.
 // DesktopBackgroundWidgetController is owned by RootWindowController.
 // When the animation completes the old DesktopBackgroundWidgetController is
 // destroyed. Exported for tests.
 class ASH_EXPORT DesktopBackgroundWidgetController
     : public views::WidgetObserver,
-      public wm::WmWindowObserver {
+      public WmWindowObserver {
  public:
   // Create
   explicit DesktopBackgroundWidgetController(views::Widget* widget);
 
   ~DesktopBackgroundWidgetController() override;
 
   // Overridden from views::WidgetObserver.
   void OnWidgetDestroying(views::Widget* widget) override;
 
   // Set bounds of component that draws background.
   void SetBounds(const gfx::Rect& bounds);
 
   // Move component from |src_container| in |root_window| to |dest_container|.
   // It is required for lock screen, when we need to move background so that
   // it hides user's windows. Returns true if there was something to reparent.
   bool Reparent(aura::Window* root_window,
                 int src_container,
                 int dest_container);
 
   // Starts wallpaper fade in animation. |root_window_controller| is
   // the root window where the animation will happen. (This is
   // necessary this as |layer_| doesn't have access to the root window).
   void StartAnimating(RootWindowController* root_window_controller);
 
   views::Widget* widget() { return widget_; }
 
  private:
   void RemoveObservers();
 
-  // wm::WmWindowObserver:
-  void OnWindowBoundsChanged(wm::WmWindow* window,
+  // WmWindowObserver:
+  void OnWindowBoundsChanged(WmWindow* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
 
   views::Widget* widget_;
 
   // Parent of |widget_|.
-  wm::WmWindow* widget_parent_;
+  WmWindow* widget_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundWidgetController);
 };
 
 // This class wraps a DesktopBackgroundWidgetController pointer. It is owned
 // by RootWindowController. The instance of DesktopBackgroundWidgetController is
 // moved to this RootWindowController when the animation completes.
 // Exported for tests.
 class ASH_EXPORT AnimatingDesktopController {
  public:
@@ skipping 22 matching lines @@
 
  private:
   std::unique_ptr<DesktopBackgroundWidgetController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimatingDesktopController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_WIDGET_CONTROLLER_H_