Shuffles and renames ash/common/wm classes

ash/wm/overview/window_selector.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/wm/overview/window_selector.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/shelf/wm_shelf.h"
 #include "ash/common/wm/switchable_windows.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm/wm_globals.h"
-#include "ash/common/wm/wm_lookup.h"
-#include "ash/common/wm/wm_root_window_controller.h"
 #include "ash/common/wm/wm_user_metrics_action.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ash/wm/overview/window_grid.h"
 #include "ash/wm/overview/window_selector_delegate.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 28 matching lines @@
     ::ui::ResourceBundle::FontStyle::MediumFont;
 
 // The alpha value for the background of the text filtering textbox.
 const unsigned char kTextFilterOpacity = 180;
 
 // The radius used for the rounded corners on the text filtering textbox.
 const int kTextFilterCornerRadius = 1;
 
 // A comparator for locating a grid with a given root window.
 struct RootWindowGridComparator {
-  explicit RootWindowGridComparator(const wm::WmWindow* root_window)
+  explicit RootWindowGridComparator(const WmWindow* root_window)
       : root_window_(root_window) {}
 
   bool operator()(const std::unique_ptr<WindowGrid>& grid) const {
     return grid->root_window() == root_window_;
   }
 
-  const wm::WmWindow* root_window_;
+  const WmWindow* root_window_;
 };
 
 // A comparator for locating a selectable window given a targeted window.
 struct WindowSelectorItemTargetComparator {
-  explicit WindowSelectorItemTargetComparator(const wm::WmWindow* target_window)
+  explicit WindowSelectorItemTargetComparator(const WmWindow* target_window)
       : target(target_window) {}
 
   bool operator()(WindowSelectorItem* window) const {
     return window->GetWindow() == target;
   }
 
-  const wm::WmWindow* target;
+  const WmWindow* target;
 };
 
 // A comparator for locating a selector item for a given root.
 struct WindowSelectorItemForRoot {
-  explicit WindowSelectorItemForRoot(const wm::WmWindow* root)
+  explicit WindowSelectorItemForRoot(const WmWindow* root)
       : root_window(root) {}
 
   bool operator()(WindowSelectorItem* item) const {
     return item->root_window() == root_window;
   }
 
-  const wm::WmWindow* root_window;
+  const WmWindow* root_window;
 };
 
 // A View having rounded corners and a specified background color which is
 // only painted within the bounds defined by the rounded corners.
 // TODO(tdanderson): This duplicates code from RoundedImageView. Refactor these
 //                   classes and move into ui/views.
 class RoundedContainerView : public views::View {
  public:
   RoundedContainerView(int corner_radius, SkColor background)
       : corner_radius_(corner_radius),
@@ skipping 20 matching lines @@
 
  private:
   int corner_radius_;
   SkColor background_;
 
   DISALLOW_COPY_AND_ASSIGN(RoundedContainerView);
 };
 
 // Triggers a shelf visibility update on all root window controllers.
 void UpdateShelfVisibility() {
-  for (wm::WmWindow* root : wm::WmGlobals::Get()->GetAllRootWindows())
+  for (WmWindow* root : WmShell::Get()->GetAllRootWindows())
     root->GetRootWindowController()->GetShelf()->UpdateVisibilityState();
 }
 
 // Initializes the text filter on the top of the main root window and requests
 // focus on its textfield.
 views::Widget* CreateTextFilter(views::TextfieldController* controller,
-                                wm::WmWindow* root_window) {
+                                WmWindow* root_window) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.accept_events = true;
   params.bounds = gfx::Rect(
       root_window->GetBounds().width() / 2 * (1 - kTextFilterScreenProportion),
       kTextFilterDistanceFromTop,
       root_window->GetBounds().width() * kTextFilterScreenProportion,
@@ skipping 22 matching lines @@
   textfield->SetTextColor(SK_ColorWHITE);
   textfield->SetFontList(bundle.GetFontList(kTextFilterFontStyle));
 
   container->AddChildView(textfield);
   widget->SetContentsView(container);
 
   // The textfield initially contains no text, so shift its position to be
   // outside the visible bounds of the screen.
   gfx::Transform transform;
   transform.Translate(0, -WindowSelector::kTextFilterBottomEdge);
-  wm::WmLookup::Get()->GetWindowForWidget(widget)->SetTransform(transform);
+  WmLookup::Get()->GetWindowForWidget(widget)->SetTransform(transform);
   widget->Show();
   textfield->RequestFocus();
 
   return widget;
 }
 
 }  // namespace
 
 const int WindowSelector::kTextFilterBottomEdge =
     kTextFilterDistanceFromTop + kTextFilterHeight;
 
 // static
-bool WindowSelector::IsSelectable(wm::WmWindow* window) {
+bool WindowSelector::IsSelectable(WmWindow* window) {
   wm::WindowState* state = window->GetWindowState();
   if (state->GetStateType() == wm::WINDOW_STATE_TYPE_DOCKED ||
       state->GetStateType() == wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED) {
     return false;
   }
   return state->IsUserPositionable();
 }
 
 WindowSelector::WindowSelector(WindowSelectorDelegate* delegate)
     : delegate_(delegate),
-      restore_focus_window_(wm::WmGlobals::Get()->GetFocusedWindow()),
+      restore_focus_window_(WmShell::Get()->GetFocusedWindow()),
       ignore_activations_(false),
       selected_grid_index_(0),
       overview_start_time_(base::Time::Now()),
       num_key_presses_(0),
       num_items_(0),
       showing_selection_widget_(false),
       text_filter_string_length_(0),
       num_times_textfield_cleared_(0),
       restoring_minimized_windows_(false) {
   DCHECK(delegate_);
 }
 
 WindowSelector::~WindowSelector() {
   RemoveAllObservers();
 }
 
 // NOTE: The work done in Init() is not done in the constructor because it may
 // cause other, unrelated classes, (ie PanelLayoutManager) to make indirect
 // calls to restoring_minimized_windows() on a partially constructed object.
 void WindowSelector::Init(const WindowList& windows) {
   if (restore_focus_window_)
     restore_focus_window_->AddObserver(this);
 
-  wm::WmGlobals* globals = wm::WmGlobals::Get();
+  WmShell* shell = WmShell::Get();
 
-  std::vector<wm::WmWindow*> root_windows = globals->GetAllRootWindows();
+  std::vector<WmWindow*> root_windows = shell->GetAllRootWindows();
   std::sort(root_windows.begin(), root_windows.end(),
-            [](const wm::WmWindow* a, const wm::WmWindow* b) {
+            [](const WmWindow* a, const WmWindow* b) {
               // Since we don't know if windows are vertically or horizontally
               // oriented we use both x and y position. This may be confusing
               // if you have 3 or more monitors which are not strictly
               // horizontal or vertical but that case is not yet supported.
               return (a->GetBoundsInScreen().x() + a->GetBoundsInScreen().y()) <
                      (b->GetBoundsInScreen().x() + b->GetBoundsInScreen().y());
             });
 
-  for (wm::WmWindow* root : root_windows) {
+  for (WmWindow* root : root_windows) {
     // Observed switchable containers for newly created windows on all root
     // windows.
     for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i) {
-      wm::WmWindow* container =
+      WmWindow* container =
           root->GetChildByShellWindowId(wm::kSwitchableWindowContainerIds[i]);
       container->AddObserver(this);
       observed_windows_.insert(container);
     }
 
     // Hide the callout widgets for panels. It is safe to call this for
     // root windows that don't contain any panel windows.
     PanelLayoutManager::Get(root)->SetShowCalloutWidgets(false);
 
     std::unique_ptr<WindowGrid> grid(new WindowGrid(root, windows, this));
@@ skipping 16 matching lines @@
 
     // Do not call PrepareForOverview until all items are added to window_list_
     // as we don't want to cause any window updates until all windows in
     // overview are observed. See http://crbug.com/384495.
     for (std::unique_ptr<WindowGrid>& window_grid : grid_list_) {
       window_grid->PrepareForOverview();
       window_grid->PositionWindows(true);
     }
 
     text_filter_widget_.reset(
-        CreateTextFilter(this, globals->GetPrimaryRootWindow()));
+        CreateTextFilter(this, shell->GetPrimaryRootWindow()));
   }
 
   DCHECK(!grid_list_.empty());
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.Items", num_items_);
 
-  globals->AddActivationObserver(this);
+  shell->AddActivationObserver(this);
 
   display::Screen::GetScreen()->AddObserver(this);
-  globals->RecordUserMetricsAction(wm::WmUserMetricsAction::WINDOW_OVERVIEW);
+  shell->RecordUserMetricsAction(wm::WmUserMetricsAction::WINDOW_OVERVIEW);
   // Send an a11y alert.
   Shell::GetInstance()->accessibility_delegate()->TriggerAccessibilityAlert(
       ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
 
   UpdateShelfVisibility();
 }
 
 // NOTE: The work done in Shutdown() is not done in the destructor because it
 // may cause other, unrelated classes, (ie PanelLayoutManager) to make indirect
 // calls to restoring_minimized_windows() on a partially destructed object.
 void WindowSelector::Shutdown() {
   ResetFocusRestoreWindow(true);
   RemoveAllObservers();
 
-  std::vector<wm::WmWindow*> root_windows =
-      wm::WmGlobals::Get()->GetAllRootWindows();
-  for (wm::WmWindow* window : root_windows) {
+  std::vector<WmWindow*> root_windows = WmShell::Get()->GetAllRootWindows();
+  for (WmWindow* window : root_windows) {
     // Un-hide the callout widgets for panels. It is safe to call this for
     // root_windows that don't contain any panel windows.
     PanelLayoutManager::Get(window)->SetShowCalloutWidgets(true);
   }
 
   size_t remaining_items = 0;
   for (std::unique_ptr<WindowGrid>& window_grid : grid_list_) {
     for (WindowSelectorItem* window_selector_item : window_grid->window_list())
       window_selector_item->RestoreWindow();
     remaining_items += window_grid->size();
@@ skipping 18 matching lines @@
         "Ash.WindowSelector.ItemsWhenTextFilteringUsed",
         remaining_items);
   }
 
   // Clearing the window list resets the ignored_by_shelf flag on the windows.
   grid_list_.clear();
   UpdateShelfVisibility();
 }
 
 void WindowSelector::RemoveAllObservers() {
-  for (wm::WmWindow* window : observed_windows_)
+  for (WmWindow* window : observed_windows_)
     window->RemoveObserver(this);
 
-  wm::WmGlobals::Get()->RemoveActivationObserver(this);
+  WmShell::Get()->RemoveActivationObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
   if (restore_focus_window_)
     restore_focus_window_->RemoveObserver(this);
 }
 
 void WindowSelector::CancelSelection() {
   delegate_->OnSelectionEnded();
 }
 
 void WindowSelector::OnGridEmpty(WindowGrid* grid) {
   size_t index = 0;
   for (auto iter = grid_list_.begin(); iter != grid_list_.end(); ++iter) {
     if (grid == (*iter).get()) {
       index = iter - grid_list_.begin();
       grid_list_.erase(iter);
       break;
     }
   }
   if (index > 0 && selected_grid_index_ >= index) {
     selected_grid_index_--;
     // If the grid which became empty was the one with the selected window, we
     // need to select a window on the newly selected grid.
     if (selected_grid_index_ == index - 1)
       Move(LEFT, true);
   }
   if (grid_list_.empty())
     CancelSelection();
 }
 
-void WindowSelector::SelectWindow(wm::WmWindow* window) {
+void WindowSelector::SelectWindow(WmWindow* window) {
   // Record UMA_WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED if the user is selecting
   // a window other than the window that was active prior to entering overview
   // mode (i.e., the window at the front of the MRU list).
-  std::vector<wm::WmWindow*> window_list =
-      wm::WmGlobals::Get()->GetMruWindowList();
+  std::vector<WmWindow*> window_list = WmShell::Get()->GetMruWindowList();
   if (!window_list.empty() && window_list[0] != window) {
-    wm::WmGlobals::Get()->RecordUserMetricsAction(
+    WmShell::Get()->RecordUserMetricsAction(
         wm::WmUserMetricsAction::WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED);
   }
 
   window->GetWindowState()->Activate();
 }
 
 bool WindowSelector::HandleKeyEvent(views::Textfield* sender,
                                     const ui::KeyEvent& key_event) {
   if (key_event.type() != ui::ET_KEY_PRESSED)
     return false;
@@ skipping 21 matching lines @@
       break;
     case ui::VKEY_RETURN:
       // Ignore if no item is selected.
       if (!grid_list_[selected_grid_index_]->is_selecting())
         return false;
       UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.ArrowKeyPresses",
                                num_key_presses_);
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "Ash.WindowSelector.KeyPressesOverItemsRatio",
           (num_key_presses_ * 100) / num_items_, 1, 300, 30);
-      wm::WmGlobals::Get()->RecordUserMetricsAction(
+      WmShell::Get()->RecordUserMetricsAction(
           wm::WmUserMetricsAction::WINDOW_OVERVIEW_ENTER_KEY);
       SelectWindow(
           grid_list_[selected_grid_index_]->SelectedWindow()->GetWindow());
       break;
     default:
       // Not a key we are interested in, allow the textfield to handle it.
       return false;
   }
   return true;
 }
 
 void WindowSelector::OnDisplayAdded(const display::Display& display) {}
 
 void WindowSelector::OnDisplayRemoved(const display::Display& display) {
   // TODO(flackr): Keep window selection active on remaining displays.
   CancelSelection();
 }
 
 void WindowSelector::OnDisplayMetricsChanged(const display::Display& display,
                                              uint32_t metrics) {
   PositionWindows(/* animate */ false);
   RepositionTextFilterOnDisplayMetricsChange();
 }
 
-void WindowSelector::OnWindowTreeChanged(wm::WmWindow* window,
+void WindowSelector::OnWindowTreeChanged(WmWindow* window,
                                          const TreeChangeParams& params) {
   // Only care about newly added children of |observed_windows_|.
   if (!observed_windows_.count(window) ||
       !observed_windows_.count(params.new_parent)) {
     return;
   }
 
-  wm::WmWindow* new_window = params.target;
+  WmWindow* new_window = params.target;
   if (!IsSelectable(new_window))
     return;
 
   for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i) {
     if (new_window->GetParent()->GetShellWindowId() ==
             wm::kSwitchableWindowContainerIds[i] &&
         !new_window->GetTransientParent()) {
       // The new window is in one of the switchable containers, abort overview.
       CancelSelection();
       return;
     }
   }
 }
 
-void WindowSelector::OnWindowDestroying(wm::WmWindow* window) {
+void WindowSelector::OnWindowDestroying(WmWindow* window) {
   window->RemoveObserver(this);
   observed_windows_.erase(window);
   if (window == restore_focus_window_)
     restore_focus_window_ = nullptr;
 }
 
-void WindowSelector::OnWindowActivated(wm::WmWindow* gained_active,
-                                       wm::WmWindow* lost_active) {
+void WindowSelector::OnWindowActivated(WmWindow* gained_active,
+                                       WmWindow* lost_active) {
   if (ignore_activations_ || !gained_active ||
       gained_active == GetTextFilterWidgetWindow()) {
     return;
   }
 
   auto grid =
       std::find_if(grid_list_.begin(), grid_list_.end(),
                    RootWindowGridComparator(gained_active->GetRootWindow()));
   if (grid == grid_list_.end())
     return;
   const std::vector<WindowSelectorItem*> windows = (*grid)->window_list();
 
   auto iter = std::find_if(windows.begin(), windows.end(),
                            WindowSelectorItemTargetComparator(gained_active));
 
   if (iter != windows.end())
     (*iter)->ShowWindowOnExit();
 
   // Don't restore focus on exit if a window was just activated.
   ResetFocusRestoreWindow(false);
   CancelSelection();
 }
 
-void WindowSelector::OnAttemptToReactivateWindow(wm::WmWindow* request_active,
-                                                 wm::WmWindow* actual_active) {
+void WindowSelector::OnAttemptToReactivateWindow(WmWindow* request_active,
+                                                 WmWindow* actual_active) {
   OnWindowActivated(request_active, actual_active);
 }
 
 void WindowSelector::ContentsChanged(views::Textfield* sender,
                                      const base::string16& new_contents) {
   text_filter_string_length_ = new_contents.length();
   if (!text_filter_string_length_)
     num_times_textfield_cleared_++;
 
   bool should_show_selection_widget = !new_contents.empty();
   if (showing_selection_widget_ != should_show_selection_widget) {
-    wm::WmWindow* text_filter_widget_window = GetTextFilterWidgetWindow();
+    WmWindow* text_filter_widget_window = GetTextFilterWidgetWindow();
     ui::ScopedLayerAnimationSettings animation_settings(
         text_filter_widget_window->GetLayer()->GetAnimator());
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     animation_settings.SetTweenType(showing_selection_widget_ ?
         gfx::Tween::FAST_OUT_LINEAR_IN : gfx::Tween::LINEAR_OUT_SLOW_IN);
 
     gfx::Transform transform;
     if (should_show_selection_widget) {
       transform.Translate(0, 0);
       text_filter_widget_window->SetOpacity(1);
     } else {
       transform.Translate(0, -kTextFilterBottomEdge);
       text_filter_widget_window->SetOpacity(0);
     }
 
     text_filter_widget_window->SetTransform(transform);
     showing_selection_widget_ = should_show_selection_widget;
   }
   for (auto iter = grid_list_.begin(); iter != grid_list_.end(); iter++)
     (*iter)->FilterItems(new_contents);
 
   // If the selection widget is not active, execute a Move() command so that it
   // shows up on the first undimmed item.
   if (grid_list_[selected_grid_index_]->is_selecting())
     return;
   Move(WindowSelector::RIGHT, false);
 }
 
-wm::WmWindow* WindowSelector::GetTextFilterWidgetWindow() {
-  return wm::WmLookup::Get()->GetWindowForWidget(text_filter_widget_.get());
+WmWindow* WindowSelector::GetTextFilterWidgetWindow() {
+  return WmLookup::Get()->GetWindowForWidget(text_filter_widget_.get());
 }
 
 void WindowSelector::PositionWindows(bool animate) {
   for (std::unique_ptr<WindowGrid>& grid : grid_list_)
     grid->PositionWindows(animate);
 }
 
 void WindowSelector::RepositionTextFilterOnDisplayMetricsChange() {
-  wm::WmWindow* root_window = wm::WmGlobals::Get()->GetPrimaryRootWindow();
+  WmWindow* root_window = WmShell::Get()->GetPrimaryRootWindow();
   gfx::Rect rect(
       root_window->GetBounds().width() / 2 * (1 - kTextFilterScreenProportion),
       kTextFilterDistanceFromTop,
       root_window->GetBounds().width() * kTextFilterScreenProportion,
       kTextFilterHeight);
 
   text_filter_widget_->SetBounds(rect);
 
   gfx::Transform transform;
   transform.Translate(0, text_filter_string_length_ == 0
@@ skipping 34 matching lines @@
   for (size_t i = 0;
       i <= grid_list_.size() &&
       grid_list_[selected_grid_index_]->Move(direction, animate); i++) {
     selected_grid_index_ =
         (selected_grid_index_ + display_direction + grid_list_.size()) %
         grid_list_.size();
   }
 }
 
 }  // namespace ash