Converts overview to use common ash types

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/metrics/user_metrics_recorder.h"
-#include "ash/root_window_controller.h"
 #include "ash/shell.h"
-#include "ash/shell_window_ids.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/panels/panel_layout_manager.h"
+#include "ash/wm/common/shelf/wm_shelf.h"
 #include "ash/wm/common/switchable_windows.h"
 #include "ash/wm/common/window_state.h"
-#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/common/wm_globals.h"
+#include "ash/wm/common/wm_lookup.h"
+#include "ash/wm/common/wm_root_window_controller.h"
+#include "ash/wm/common/wm_shell_window_ids.h"
+#include "ash/wm/common/wm_user_metrics_action.h"
+#include "ash/wm/common/wm_window.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 "ash/wm/window_state_aura.h"
-#include "ash/wm/window_util.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/aura/client/focus_client.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/wm/core/window_util.h"
-#include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
 // The proportion of screen width that the text filter takes.
 const float kTextFilterScreenProportion = 0.25;
 
 // The amount of padding surrounding the text in the text filtering textbox.
 const int kTextFilterHorizontalPadding = 8;
@@ skipping 10 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 aura::Window* root_window)
-      : root_window_(root_window) {
+  explicit RootWindowGridComparator(const wm::WmWindow* root_window)
+      : root_window_(root_window) {}
+
+  bool operator()(const std::unique_ptr<WindowGrid>& grid) const {
+    return grid->root_window() == root_window_;
   }
 
-  bool operator()(WindowGrid* grid) const {
-    return (grid->root_window() == root_window_);
-  }
-
-  const aura::Window* root_window_;
+  const wm::WmWindow* root_window_;
 };
 
 // A comparator for locating a selectable window given a targeted window.
 struct WindowSelectorItemTargetComparator {
-  explicit WindowSelectorItemTargetComparator(const aura::Window* target_window)
-      : target(target_window) {
-  }
+  explicit WindowSelectorItemTargetComparator(const wm::WmWindow* target_window)
+      : target(target_window) {}
 
   bool operator()(WindowSelectorItem* window) const {
     return window->GetWindow() == target;
   }
 
-  const aura::Window* target;
+  const wm::WmWindow* target;
 };
 
 // A comparator for locating a selector item for a given root.
 struct WindowSelectorItemForRoot {
-  explicit WindowSelectorItemForRoot(const aura::Window* root)
-      : root_window(root) {
-  }
+  explicit WindowSelectorItemForRoot(const wm::WmWindow* root)
+      : root_window(root) {}
 
   bool operator()(WindowSelectorItem* item) const {
     return item->root_window() == root_window;
   }
 
-  const aura::Window* root_window;
+  const wm::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() {
-  Shell::RootWindowControllerList root_window_controllers =
-      Shell::GetInstance()->GetAllRootWindowControllers();
-  for (Shell::RootWindowControllerList::iterator iter =
-          root_window_controllers.begin();
-       iter != root_window_controllers.end(); ++iter) {
-    (*iter)->UpdateShelfVisibility();
-  }
+  for (wm::WmWindow* root : wm::WmGlobals::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,
-                                aura::Window* root_window) {
+                                wm::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.parent = Shell::GetContainer(root_window,
-                                      kShellWindowId_OverlayContainer);
   params.accept_events = true;
   params.bounds = gfx::Rect(
-      root_window->bounds().width() / 2 * (1 - kTextFilterScreenProportion),
+      root_window->GetBounds().width() / 2 * (1 - kTextFilterScreenProportion),
       kTextFilterDistanceFromTop,
-      root_window->bounds().width() * kTextFilterScreenProportion,
+      root_window->GetBounds().width() * kTextFilterScreenProportion,
       kTextFilterHeight);
+  root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
+      widget, kShellWindowId_OverlayContainer, &params);
   widget->Init(params);
 
   // Use |container| to specify the padding surrounding the text and to give
   // the textfield rounded corners.
   views::View* container = new RoundedContainerView(
       kTextFilterCornerRadius, SkColorSetARGB(kTextFilterOpacity, 0, 0, 0));
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   int text_height = bundle.GetFontList(kTextFilterFontStyle).GetHeight();
   DCHECK(text_height);
   int vertical_padding = (kTextFilterHeight - text_height) / 2;
   container->SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
                                                    kTextFilterHorizontalPadding,
                                                    vertical_padding,
                                                    0));
 
   views::Textfield* textfield = new views::Textfield;
   textfield->set_controller(controller);
   textfield->SetBackgroundColor(SK_ColorTRANSPARENT);
   textfield->SetBorder(views::Border::NullBorder());
   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);
-  widget->GetNativeWindow()->SetTransform(transform);
+  wm::WmLookup::Get()->GetWindowForWidget(widget)->SetTransform(transform);
   widget->Show();
   textfield->RequestFocus();
 
   return widget;
 }
 
 }  // namespace
 
 const int WindowSelector::kTextFilterBottomEdge =
     kTextFilterDistanceFromTop + kTextFilterHeight;
 
 // static
-bool WindowSelector::IsSelectable(aura::Window* window) {
-  wm::WindowState* state = wm::GetWindowState(window);
+bool WindowSelector::IsSelectable(wm::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_(aura::client::GetFocusClient(
-          Shell::GetPrimaryRootWindow())->GetFocusedWindow()),
+      restore_focus_window_(wm::WmGlobals::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);
 
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  wm::WmGlobals* globals = wm::WmGlobals::Get();
+
+  std::vector<wm::WmWindow*> root_windows = globals->GetAllRootWindows();
   std::sort(root_windows.begin(), root_windows.end(),
-            [](const aura::Window* a, const aura::Window* b) {
+            [](const wm::WmWindow* a, const wm::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 (aura::Window::Windows::const_iterator iter = root_windows.begin();
-       iter != root_windows.end(); iter++) {
+  for (wm::WmWindow* root : root_windows) {
     // Observed switchable containers for newly created windows on all root
     // windows.
     for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i) {
-      aura::Window* container =
-          Shell::GetContainer(*iter, wm::kSwitchableWindowContainerIds[i]);
+      wm::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(wm::WmWindowAura::Get(*iter))
-        ->SetShowCalloutWidgets(false);
+    PanelLayoutManager::Get(root)->SetShowCalloutWidgets(false);
 
-    std::unique_ptr<WindowGrid> grid(new WindowGrid(*iter, windows, this));
+    std::unique_ptr<WindowGrid> grid(new WindowGrid(root, windows, this));
     if (grid->empty())
       continue;
     num_items_ += grid->size();
     grid_list_.push_back(std::move(grid));
   }
 
   {
     // The calls to WindowGrid::PrepareForOverview() and CreateTextFilter(...)
     // requires some LayoutManagers (ie PanelLayoutManager) to perform layouts
     // so that windows are correctly visible and properly animated in overview
     // mode. Otherwise these layouts should be suppressed during overview mode
     // so they don't conflict with overview mode animations. The
     // |restoring_minimized_windows_| flag enables the PanelLayoutManager to
     // make this decision.
     base::AutoReset<bool> auto_restoring_minimized_windows(
         &restoring_minimized_windows_, true);
 
     // 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 (WindowGrid* window_grid : grid_list_) {
+    for (std::unique_ptr<WindowGrid>& window_grid : grid_list_) {
       window_grid->PrepareForOverview();
       window_grid->PositionWindows(true);
     }
 
     text_filter_widget_.reset(
-        CreateTextFilter(this, Shell::GetPrimaryRootWindow()));
+        CreateTextFilter(this, globals->GetPrimaryRootWindow()));
   }
 
   DCHECK(!grid_list_.empty());
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.Items", num_items_);
 
-  Shell* shell = Shell::GetInstance();
-
-  shell->activation_client()->AddObserver(this);
+  globals->AddActivationObserver(this);
 
   display::Screen::GetScreen()->AddObserver(this);
-  shell->metrics()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW);
+  globals->RecordUserMetricsAction(wm::WmUserMetricsAction::WINDOW_OVERVIEW);
   // Send an a11y alert.
-  shell->accessibility_delegate()->TriggerAccessibilityAlert(
+  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();
 
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
-       iter != root_windows.end(); iter++) {
+  std::vector<wm::WmWindow*> root_windows =
+      wm::WmGlobals::Get()->GetAllRootWindows();
+  for (wm::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(wm::WmWindowAura::Get(*iter))
-        ->SetShowCalloutWidgets(true);
+    PanelLayoutManager::Get(window)->SetShowCalloutWidgets(true);
   }
 
   size_t remaining_items = 0;
-  for (WindowGrid* window_grid : grid_list_) {
+  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();
   }
 
   DCHECK(num_items_ >= remaining_items);
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.OverviewClosedItems",
                            num_items_ - remaining_items);
   UMA_HISTOGRAM_MEDIUM_TIMES("Ash.WindowSelector.TimeInOverview",
                              base::Time::Now() - overview_start_time_);
@@ skipping 11 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() {
-  Shell* shell = Shell::GetInstance();
-  for (aura::Window* window : observed_windows_)
+  for (wm::WmWindow* window : observed_windows_)
     window->RemoveObserver(this);
 
-  shell->activation_client()->RemoveObserver(this);
+  wm::WmGlobals::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) {
-  ScopedVector<WindowGrid>::iterator iter =
-      std::find(grid_list_.begin(), grid_list_.end(), grid);
-  DCHECK(iter != grid_list_.end());
-  size_t index = iter - grid_list_.begin();
-  grid_list_.erase(iter);
+  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(aura::Window* window) {
+void WindowSelector::SelectWindow(wm::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).
-  MruWindowTracker::WindowList window_list =
-      Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
-  if (window_list.size() > 0 && window_list[0] != window) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-        UMA_WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED);
+  std::vector<wm::WmWindow*> window_list =
+      wm::WmGlobals::Get()->GetMruWindowList();
+  if (!window_list.empty() && window_list[0] != window) {
+    wm::WmGlobals::Get()->RecordUserMetricsAction(
+        wm::WmUserMetricsAction::WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED);
   }
 
-  wm::GetWindowState(window)->Activate();
+  window->GetWindowState()->Activate();
 }
 
 bool WindowSelector::HandleKeyEvent(views::Textfield* sender,
                                     const ui::KeyEvent& key_event) {
   if (key_event.type() != ui::ET_KEY_PRESSED)
     return false;
 
   switch (key_event.key_code()) {
     case ui::VKEY_ESCAPE:
       CancelSelection();
@@ skipping 17 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);
-      Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-          UMA_WINDOW_OVERVIEW_ENTER_KEY);
+      wm::WmGlobals::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::OnWindowAdded(aura::Window* new_window) {
+void WindowSelector::OnWindowTreeChanged(wm::WmWindow* window,
+                                         const TreeChangeParams& params) {
+  if (!observed_windows_.count(window) ||

[James Cook, 2016/05/27 00:02:51]

It took me a minute to figure out this was the right way to look for an add to
an observed container, maybe a comment that it's just looking for adds?

[sky, 2016/05/27 03:18:04]

Done.

+      !observed_windows_.count(params.new_parent)) {
+    return;
+  }
+
+  wm::WmWindow* new_window = params.target;
   if (!IsSelectable(new_window))
     return;
 
   for (size_t i = 0; i < wm::kSwitchableWindowContainerIdsLength; ++i) {
-    if (new_window->parent()->id() == wm::kSwitchableWindowContainerIds[i] &&
-        !::wm::GetTransientParent(new_window)) {
+    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(aura::Window* window) {
+void WindowSelector::OnWindowDestroying(wm::WmWindow* window) {
   window->RemoveObserver(this);
   observed_windows_.erase(window);
   if (window == restore_focus_window_)
     restore_focus_window_ = nullptr;
 }
 
-void WindowSelector::OnWindowActivated(
-    aura::client::ActivationChangeObserver::ActivationReason reason,
-    aura::Window* gained_active,
-    aura::Window* lost_active) {
-  if (ignore_activations_ ||
-      !gained_active ||
-      gained_active == text_filter_widget_->GetNativeWindow()) {
+void WindowSelector::OnWindowActivated(wm::WmWindow* gained_active,
+                                       wm::WmWindow* lost_active) {
+  if (ignore_activations_ || !gained_active ||
+      gained_active == GetTextFilterWidgetWindow()) {
     return;
   }
 
-  ScopedVector<WindowGrid>::iterator grid =
+  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();
 
-  ScopedVector<WindowSelectorItem>::const_iterator iter = std::find_if(
-      windows.begin(), windows.end(),
-      WindowSelectorItemTargetComparator(gained_active));
+  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(aura::Window* request_active,
-                                                 aura::Window* actual_active) {
-  OnWindowActivated(aura::client::ActivationChangeObserver::ActivationReason::
-                        ACTIVATION_CLIENT,
-                    request_active, actual_active);
+void WindowSelector::OnAttemptToReactivateWindow(wm::WmWindow* request_active,
+                                                 wm::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();
     ui::ScopedLayerAnimationSettings animation_settings(
-        text_filter_widget_->GetNativeWindow()->layer()->GetAnimator());
+        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_->GetNativeWindow()->layer()->SetOpacity(1);
+      text_filter_widget_window->SetOpacity(1);
     } else {
       transform.Translate(0, -kTextFilterBottomEdge);
-      text_filter_widget_->GetNativeWindow()->layer()->SetOpacity(0);
+      text_filter_widget_window->SetOpacity(0);
     }
 
-    text_filter_widget_->GetNativeWindow()->SetTransform(transform);
+    text_filter_widget_window->SetTransform(transform);
     showing_selection_widget_ = should_show_selection_widget;
   }
-  for (ScopedVector<WindowGrid>::iterator iter = grid_list_.begin();
-       iter != grid_list_.end(); iter++) {
+  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());
+}
+
 void WindowSelector::PositionWindows(bool animate) {
-  for (ScopedVector<WindowGrid>::iterator iter = grid_list_.begin();
-      iter != grid_list_.end(); iter++) {
-    (*iter)->PositionWindows(animate);
-  }
+  for (std::unique_ptr<WindowGrid>& grid : grid_list_)
+    grid->PositionWindows(animate);
 }
 
 void WindowSelector::RepositionTextFilterOnDisplayMetricsChange() {
-  aura::Window* root_window = Shell::GetPrimaryRootWindow();
+  wm::WmWindow* root_window = wm::WmGlobals::Get()->GetPrimaryRootWindow();
   gfx::Rect rect(
-      root_window->bounds().width() / 2 * (1 - kTextFilterScreenProportion),
+      root_window->GetBounds().width() / 2 * (1 - kTextFilterScreenProportion),
       kTextFilterDistanceFromTop,
-      root_window->bounds().width() * kTextFilterScreenProportion,
+      root_window->GetBounds().width() * kTextFilterScreenProportion,
       kTextFilterHeight);
 
   text_filter_widget_->SetBounds(rect);
 
   gfx::Transform transform;
   transform.Translate(0, text_filter_string_length_ == 0
                              ? -WindowSelector::kTextFilterBottomEdge
                              : 0);
-  text_filter_widget_->GetNativeWindow()->SetTransform(transform);
+  GetTextFilterWidgetWindow()->SetTransform(transform);
 }
 
 void WindowSelector::ResetFocusRestoreWindow(bool focus) {
   if (!restore_focus_window_)
     return;
   if (focus) {
     base::AutoReset<bool> restoring_focus(&ignore_activations_, true);
-    restore_focus_window_->Focus();
+    restore_focus_window_->Activate();
   }
   // If the window is in the observed_windows_ list it needs to continue to be
   // observed.
   if (observed_windows_.find(restore_focus_window_) ==
           observed_windows_.end()) {
     restore_focus_window_->RemoveObserver(this);
   }
   restore_focus_window_ = nullptr;
 }
 
@@ skipping 13 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