mash: remove more shell/shelf WmWindow usage.

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>
@@ skipping 113 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 (WmWindow* root : ShellPort::Get()->GetAllRootWindows())
+  for (aura::Window* root : Shell::GetAllRootWindows())
     WmShelf::ForWindow(root)->UpdateVisibilityState();
 }
 
 gfx::Rect GetTextFilterPosition(WmWindow* root_window) {
   gfx::Rect total_bounds = root_window->ConvertRectToScreen(
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(
           root_window->GetChildByShellWindowId(kShellWindowId_DefaultContainer)
               ->aura_window()));
   return gfx::Rect(
       0.5 * (total_bounds.width() -
@@ skipping 147 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);
     }
 
     search_image_ = gfx::CreateVectorIcon(ui::kSearchIcon, kTextFilterIconSize,
                                           kTextFilterIconColor);
-    WmWindow* root_window = shell_port->GetPrimaryRootWindow();
+    WmWindow* root_window = WmWindow::Get(Shell::GetPrimaryRootWindow());
     text_filter_widget_.reset(CreateTextFilter(this, root_window, search_image_,
                                                &text_filter_bottom_));
   }
 
   DCHECK(!grid_list_.empty());
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.Items", num_items_);
 
   Shell::Get()->activation_client()->AddObserver(this);
 
   display::Screen::GetScreen()->AddObserver(this);
@@ skipping 317 matching lines @@
 WmWindow* WindowSelector::GetTextFilterWidgetWindow() {
   return WmWindow::Get(text_filter_widget_->GetNativeWindow());
 }
 
 void WindowSelector::PositionWindows(bool animate) {
   for (std::unique_ptr<WindowGrid>& grid : grid_list_)
     grid->PositionWindows(animate);
 }
 
 void WindowSelector::RepositionTextFilterOnDisplayMetricsChange() {
-  WmWindow* root_window = ShellPort::Get()->GetPrimaryRootWindow();
+  WmWindow* root_window = WmWindow::Get(Shell::GetPrimaryRootWindow());
   const gfx::Rect rect = GetTextFilterPosition(root_window);
   text_filter_bottom_ = rect.bottom() + kTextFieldBottomMargin;
   text_filter_widget_->SetBounds(rect);
 
   gfx::Transform transform;
   transform.Translate(
       0, text_filter_string_length_ == 0 ? -text_filter_bottom_ : 0);
   WmWindow* text_filter_window = GetTextFilterWidgetWindow();
   text_filter_window->SetOpacity(text_filter_string_length_ == 0 ? 0 : 1);
   text_filter_window->SetTransform(transform);
@@ skipping 31 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