Shuffles and renames ash/common/wm classes

ash/wm/overview/window_selector_item.h

 // 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.
 
 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_window_observer.h"
+#include "ash/common/wm_window_observer.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 class ImageButton;
 }
 
 namespace ash {
 
 class WindowSelector;
-
-namespace wm {
 class WmWindow;
-}
 
 // This class represents an item in overview mode.
 class ASH_EXPORT WindowSelectorItem : public views::ButtonListener,
-                                      public wm::WmWindowObserver {
+                                      public WmWindowObserver {
  public:
   class OverviewLabelButton : public views::LabelButton {
    public:
     OverviewLabelButton(views::ButtonListener* listener,
                         const base::string16& text);
 
     ~OverviewLabelButton() override;
 
     void set_top_padding(int top_padding) { top_padding_ = top_padding; }
 
    protected:
     // views::LabelButton:
     gfx::Rect GetChildAreaBounds() override;
 
    private:
     // Padding on top of the button.
     int top_padding_;
 
     DISALLOW_COPY_AND_ASSIGN(OverviewLabelButton);
   };
 
-  WindowSelectorItem(wm::WmWindow* window, WindowSelector* window_selector);
+  WindowSelectorItem(WmWindow* window, WindowSelector* window_selector);
   ~WindowSelectorItem() override;
 
-  wm::WmWindow* GetWindow();
+  WmWindow* GetWindow();
 
   // Returns the root window on which this item is shown.
-  wm::WmWindow* root_window() { return root_window_; }
+  WmWindow* root_window() { return root_window_; }
 
   // Returns true if |target| is contained in this WindowSelectorItem.
-  bool Contains(const wm::WmWindow* target) const;
+  bool Contains(const WmWindow* target) const;
 
   // Restores and animates the managed window to it's non overview mode state.
   void RestoreWindow();
 
   // Forces the managed window to be shown (ie not hidden or minimized) when
   // calling RestoreWindow().
   void ShowWindowOnExit();
 
   // Dispatched before beginning window overview. This will do any necessary
   // one time actions such as restoring minimized windows.
@@ skipping 17 matching lines @@
   // Sets if the item is dimmed in the overview. Changing the value will also
   // change the visibility of the transform windows.
   void SetDimmed(bool dimmed);
   bool dimmed() const { return dimmed_; }
 
   const gfx::Rect& target_bounds() const { return target_bounds_; }
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  // wm::WmWindowObserver:
-  void OnWindowDestroying(wm::WmWindow* window) override;
-  void OnWindowTitleChanged(wm::WmWindow* window) override;
+  // WmWindowObserver:
+  void OnWindowDestroying(WmWindow* window) override;
+  void OnWindowTitleChanged(WmWindow* window) override;
 
  private:
   friend class WindowSelectorTest;
 
   // Sets the bounds of this selector's items to |target_bounds| in
   // |root_window_|. The bounds change will be animated as specified
   // by |animation_type|.
   void SetItemBounds(const gfx::Rect& target_bounds,
                      OverviewAnimationType animation_type);
 
@@ skipping 13 matching lines @@
   void UpdateHeaderLayout(OverviewAnimationType animation_type);
 
   // Updates the close buttons accessibility name.
   void UpdateCloseButtonAccessibilityName();
 
   // True if the item is being shown in the overview, false if it's being
   // filtered.
   bool dimmed_;
 
   // The root window this item is being displayed on.
-  wm::WmWindow* root_window_;
+  WmWindow* root_window_;
 
   // The contained Window's wrapper.
   ScopedTransformOverviewWindow transform_window_;
 
   // The target bounds this selector item is fit within.
   gfx::Rect target_bounds_;
 
   // True if running SetItemBounds. This prevents recursive calls resulting from
   // the bounds update when calling ::wm::RecreateWindowLayers to copy
   // a window layer for display on another monitor.
@@ skipping 17 matching lines @@
   // Pointer to the WindowSelector that owns the WindowGrid containing |this|.
   // Guaranteed to be non-null for the lifetime of |this|.
   WindowSelector* window_selector_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_