[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/wm/panels/panel_layout_manager.cc

 // 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.
 
 #include "ash/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "ash/keyboard/keyboard_observer_register.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_animation_types.h"
 #include "ash/wm/window_parenting_utils.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
 #include "base/auto_reset.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/background.h"
@@ skipping 158 matching lines @@
     Window* window = this->GetNativeWindow();
     gfx::Rect callout_bounds = window->bounds();
     if (shelf->IsHorizontalAlignment()) {
       callout_bounds.set_width(kArrowWidth);
       callout_bounds.set_height(kArrowHeight);
     } else {
       callout_bounds.set_width(kArrowHeight);
       callout_bounds.set_height(kArrowWidth);
     }
     Window* parent = window->parent();
-    // It's important this go through WmWindow and not Widget. Going through
+    // It's important this go through Window and not Widget. Going through
     // Widget means it may move do a different screen, we don't want that.
     window->SetBounds(callout_bounds);
     // Setting the bounds should not trigger changing the parent.
     DCHECK_EQ(parent, window->parent());
     if (background_->alignment() != shelf->alignment()) {
       background_->set_alignment(shelf->alignment());
       SchedulePaintInRect(gfx::Rect(callout_bounds.size()));
     }
   }
 
@@ skipping 232 matching lines @@
   Relayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, ShellObserver implementation:
 
 void PanelLayoutManager::OnOverviewModeEnded() {
   Relayout();
 }
 
-void PanelLayoutManager::OnShelfAlignmentChanged(WmWindow* root_window) {
-  if (root_window_controller_->GetWindow() == root_window)
+void PanelLayoutManager::OnShelfAlignmentChanged(aura::Window* root_window) {
+  if (root_window_controller_->GetRootWindow() == root_window)
     Relayout();
 }
 
 void PanelLayoutManager::OnVirtualKeyboardStateChanged(bool activated,
                                                        Window* root_window) {
   UpdateKeyboardObserverFromStateChanged(activated, root_window,
                                          panel_container_->GetRootWindow(),
                                          &keyboard_observer_);
 }
 
@@ skipping 177 matching lines @@
     // If the shelf is currently hidden (full-screen mode), minimize panel until
     // full-screen mode is exited. When a panel is dragged from another display
     // the shelf state does not update before the panel is added so we exclude
     // the dragged panel.
     if (panel != dragged_panel_ && restore_windows_on_shelf_visible_) {
       wm::GetWindowState(panel)->Minimize();
       restore_windows_on_shelf_visible_->Add(panel);
       continue;
     }
 
-    gfx::Rect icon_bounds =
-        shelf_->GetScreenBoundsOfItemIconForWindow(WmWindow::Get(panel));
+    gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
 
     // If both the icon width and height are 0 then there is no icon in the
     // shelf. If the shelf is hidden, one of the height or width will be
     // 0 but the position in the shelf and major dimension is still reported
     // correctly and the panel can be aligned above where the hidden icon is.
     if (icon_bounds.width() == 0 && icon_bounds.height() == 0)
       continue;
 
     if (panel->HasFocus() || panel->Contains(wm::GetFocusedWindow())) {
       DCHECK(!active_panel);
@@ skipping 158 matching lines @@
   const bool horizontal = shelf_->IsHorizontalAlignment();
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     Window* panel = iter->window;
     views::Widget* callout_widget = iter->callout_widget;
     Window* callout_widget_window = callout_widget->GetNativeWindow();
 
     gfx::Rect current_bounds = panel->GetBoundsInScreen();
     gfx::Rect bounds = panel->GetTargetBounds();
     ::wm::ConvertRectToScreen(panel->parent(), &bounds);
-    gfx::Rect icon_bounds =
-        shelf_->GetScreenBoundsOfItemIconForWindow(WmWindow::Get(panel));
+    gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
     if (icon_bounds.IsEmpty() || !panel->layer()->GetTargetVisibility() ||
         panel == dragged_panel_ || !show_callout_widgets_) {
       callout_widget->Hide();
       callout_widget_window->layer()->SetOpacity(0);
       continue;
     }
 
     gfx::Rect callout_bounds = callout_widget->GetWindowBoundsInScreen();
     gfx::Vector2d slide_vector = bounds.origin() - current_bounds.origin();
     int slide_distance = horizontal ? slide_vector.x() : slide_vector.y();
@@ skipping 91 matching lines @@
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {
   keyboard_observer_.RemoveAll();
 }
 
 }  // namespace ash