Shuffles and renames ash/common/wm classes

ash/common/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/common/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/shelf/wm_shelf.h"
 #include "ash/common/wm/shelf/wm_shelf_util.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.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_window.h"
-#include "ash/common/wm/wm_window_property.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/common/wm_window_property.h"
 #include "base/auto_reset.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.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"
 #include "ui/views/widget/widget.h"
@@ skipping 67 matching lines @@
         max_major(0),
         major_pos(0),
         major_length(0),
         window(NULL),
         slide_in(false) {}
 
   int min_major;
   int max_major;
   int major_pos;
   int major_length;
-  wm::WmWindow* window;
+  WmWindow* window;
   bool slide_in;
 };
 
 bool CompareWindowMajor(const VisiblePanelPositionInfo& win1,
                         const VisiblePanelPositionInfo& win2) {
   return win1.major_pos < win2.major_pos;
 }
 
 void FanOutPanels(std::vector<VisiblePanelPositionInfo>::iterator first,
                   std::vector<VisiblePanelPositionInfo>::iterator last) {
@@ skipping 48 matching lines @@
     offset.set_x(kPanelSlideInOffset);
   else
     offset.set_y(kPanelSlideInOffset);
   return offset;
 }
 
 }  // namespace
 
 class PanelCalloutWidget : public views::Widget {
  public:
-  explicit PanelCalloutWidget(wm::WmWindow* container) : background_(nullptr) {
+  explicit PanelCalloutWidget(WmWindow* container) : background_(nullptr) {
     InitWidget(container);
   }
 
   void SetAlignment(wm::ShelfAlignment alignment) {
     gfx::Rect callout_bounds = GetWindowBoundsInScreen();
     if (wm::IsHorizontalAlignment(alignment)) {
       callout_bounds.set_width(kArrowWidth);
       callout_bounds.set_height(kArrowHeight);
     } else {
       callout_bounds.set_width(kArrowHeight);
       callout_bounds.set_height(kArrowWidth);
     }
     SetBounds(callout_bounds);
     if (background_->alignment() != alignment) {
       background_->set_alignment(alignment);
       SchedulePaintInRect(gfx::Rect(callout_bounds.size()));
     }
   }
 
  private:
-  void InitWidget(wm::WmWindow* parent) {
+  void InitWidget(WmWindow* parent) {
     views::Widget::InitParams params;
     params.type = views::Widget::InitParams::TYPE_POPUP;
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     params.keep_on_top = true;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = parent->ConvertRectToScreen(gfx::Rect());
     params.bounds.set_width(kArrowWidth);
     params.bounds.set_height(kArrowHeight);
     params.accept_events = false;
     parent->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
         this, parent->GetShellWindowId(), &params);
     set_focus_on_creation(false);
     Init(params);
-    wm::WmWindow* widget_window = wm::WmLookup::Get()->GetWindowForWidget(this);
+    WmWindow* widget_window = WmLookup::Get()->GetWindowForWidget(this);
     DCHECK_EQ(widget_window->GetRootWindow(), parent->GetRootWindow());
     views::View* content_view = new views::View;
     background_ = new CalloutWidgetBackground;
     content_view->set_background(background_);
     SetContentsView(content_view);
     widget_window->GetLayer()->SetOpacity(0);
   }
 
   // Weak pointer owned by this widget's content view.
   CalloutWidgetBackground* background_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelCalloutWidget);
 };
 
 views::Widget* PanelLayoutManager::PanelInfo::CalloutWidget() {
   return callout_widget;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager public implementation:
-PanelLayoutManager::PanelLayoutManager(wm::WmWindow* panel_container)
+PanelLayoutManager::PanelLayoutManager(WmWindow* panel_container)
     : panel_container_(panel_container),
       root_window_controller_(panel_container->GetRootWindowController()),
       in_add_window_(false),
       in_layout_(false),
       show_callout_widgets_(true),
       dragged_panel_(NULL),
       shelf_(nullptr),
       last_active_panel_(NULL),
       weak_factory_(this) {
   DCHECK(panel_container);
-  wm::WmGlobals* globals = panel_container->GetGlobals();
-  globals->AddActivationObserver(this);
-  globals->AddDisplayObserver(this);
-  globals->AddOverviewModeObserver(this);
+  WmShell* shell = panel_container->GetShell();
+  shell->AddActivationObserver(this);
+  shell->AddDisplayObserver(this);
+  shell->AddOverviewModeObserver(this);
   root_window_controller_->AddObserver(this);
 }
 
 PanelLayoutManager::~PanelLayoutManager() {
   Shutdown();
 }
 
 // static
-PanelLayoutManager* PanelLayoutManager::Get(wm::WmWindow* window) {
+PanelLayoutManager* PanelLayoutManager::Get(WmWindow* window) {
   if (!window)
     return nullptr;
 
   return static_cast<PanelLayoutManager*>(
       window->GetRootWindow()
           ->GetChildByShellWindowId(kShellWindowId_PanelContainer)
           ->GetLayoutManager());
 }
 
 void PanelLayoutManager::Shutdown() {
   if (shelf_) {
     shelf_->RemoveObserver(this);
     shelf_ = nullptr;
   }
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     delete iter->callout_widget;
   }
   panel_windows_.clear();
-  wm::WmGlobals* globals = panel_container_->GetGlobals();
-  globals->RemoveActivationObserver(this);
-  globals->RemoveDisplayObserver(this);
-  globals->RemoveOverviewModeObserver(this);
+  WmShell* shell = panel_container_->GetShell();
+  shell->RemoveActivationObserver(this);
+  shell->RemoveDisplayObserver(this);
+  shell->RemoveOverviewModeObserver(this);
   root_window_controller_->RemoveObserver(this);
 }
 
-void PanelLayoutManager::StartDragging(wm::WmWindow* panel) {
+void PanelLayoutManager::StartDragging(WmWindow* panel) {
   DCHECK(!dragged_panel_);
   dragged_panel_ = panel;
   Relayout();
 }
 
 void PanelLayoutManager::FinishDragging() {
   dragged_panel_ = NULL;
   Relayout();
 }
 
 void PanelLayoutManager::SetShelf(wm::WmShelf* shelf) {
   DCHECK(!shelf_);
   shelf_ = shelf;
   shelf_->AddObserver(this);
   WillChangeVisibilityState(shelf_->GetVisibilityState());
 }
 
-void PanelLayoutManager::ToggleMinimize(wm::WmWindow* panel) {
+void PanelLayoutManager::ToggleMinimize(WmWindow* panel) {
   DCHECK(panel->GetParent() == panel_container_);
   wm::WindowState* window_state = panel->GetWindowState();
   if (window_state->IsMinimized())
     window_state->Restore();
   else
     window_state->Minimize();
 }
 
 void PanelLayoutManager::SetShowCalloutWidgets(bool show) {
   if (show_callout_widgets_ == show)
     return;
   show_callout_widgets_ = show;
   UpdateCallouts();
 }
 
-views::Widget* PanelLayoutManager::GetCalloutWidgetForPanel(
-    wm::WmWindow* panel) {
+views::Widget* PanelLayoutManager::GetCalloutWidgetForPanel(WmWindow* panel) {
   DCHECK(panel->GetParent() == panel_container_);
   PanelList::iterator found =
       std::find(panel_windows_.begin(), panel_windows_.end(), panel);
   DCHECK(found != panel_windows_.end());
   return found->callout_widget;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, wm::WmLayoutManager implementation:
+// PanelLayoutManager, WmLayoutManager implementation:
 void PanelLayoutManager::OnWindowResized() {
   Relayout();
 }
 
-void PanelLayoutManager::OnWindowAddedToLayout(wm::WmWindow* child) {
+void PanelLayoutManager::OnWindowAddedToLayout(WmWindow* child) {
   if (child->GetType() == ui::wm::WINDOW_TYPE_POPUP)
     return;
   if (in_add_window_)
     return;
   base::AutoReset<bool> auto_reset_in_add_window(&in_add_window_, true);
   if (!child->GetWindowState()->panel_attached()) {
     // This should only happen when a window is added to panel container as a
     // result of bounds change from within the application during a drag.
     // If so we have already stopped the drag and should reparent the panel
     // back to appropriate container and ignore it.
     // TODO(varkha): Updating bounds during a drag can cause problems and a more
     // general solution is needed. See http://crbug.com/251813 .
-    wm::WmWindow* old_parent = child->GetParent();
+    WmWindow* old_parent = child->GetParent();
     child->SetParentUsingContext(child,
                                  child->GetRootWindow()->GetBoundsInScreen());
     wm::ReparentTransientChildrenOfChild(child, old_parent, child->GetParent());
     DCHECK(child->GetParent()->GetShellWindowId() !=
            kShellWindowId_PanelContainer);
     return;
   }
   PanelInfo panel_info;
   panel_info.window = child;
   panel_info.callout_widget = new PanelCalloutWidget(panel_container_);
   panel_info.slide_in = child != dragged_panel_;
   panel_windows_.push_back(panel_info);
   child->AddObserver(this);
   child->GetWindowState()->AddObserver(this);
   Relayout();
 }
 
-void PanelLayoutManager::OnWillRemoveWindowFromLayout(wm::WmWindow* child) {}
+void PanelLayoutManager::OnWillRemoveWindowFromLayout(WmWindow* child) {}
 
-void PanelLayoutManager::OnWindowRemovedFromLayout(wm::WmWindow* child) {
+void PanelLayoutManager::OnWindowRemovedFromLayout(WmWindow* child) {
   if (child->GetType() == ui::wm::WINDOW_TYPE_POPUP)
     return;
   PanelList::iterator found =
       std::find(panel_windows_.begin(), panel_windows_.end(), child);
   if (found != panel_windows_.end()) {
     delete found->callout_widget;
     panel_windows_.erase(found);
   }
   if (restore_windows_on_shelf_visible_)
     restore_windows_on_shelf_visible_->Remove(child);
   child->RemoveObserver(this);
   child->GetWindowState()->RemoveObserver(this);
 
   if (dragged_panel_ == child)
     dragged_panel_ = NULL;
 
   if (last_active_panel_ == child)
     last_active_panel_ = NULL;
 
   Relayout();
 }
 
-void PanelLayoutManager::OnChildWindowVisibilityChanged(wm::WmWindow* child,
+void PanelLayoutManager::OnChildWindowVisibilityChanged(WmWindow* child,
                                                         bool visible) {
   if (visible)
     child->GetWindowState()->Restore();
   Relayout();
 }
 
-void PanelLayoutManager::SetChildBounds(wm::WmWindow* child,
+void PanelLayoutManager::SetChildBounds(WmWindow* child,
                                         const gfx::Rect& requested_bounds) {
   gfx::Rect bounds(requested_bounds);
   const gfx::Rect& max_bounds = panel_container_->GetRootWindow()->GetBounds();
   const int max_width = max_bounds.width() * kMaxWidthFactor;
   const int max_height = max_bounds.height() * kMaxHeightFactor;
   if (bounds.width() > max_width)
     bounds.set_width(max_width);
   if (bounds.height() > max_height)
     bounds.set_height(max_height);
 
@@ skipping 20 matching lines @@
     const gfx::Size min_size = child->GetMinimumSize();
     bounds.set_width(std::max(min_size.width(), bounds.width()));
     bounds.set_height(std::max(min_size.height(), bounds.height()));
   }
 
   child->SetBoundsDirect(bounds);
   Relayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, wm::WmShellObserver implementation:
+// PanelLayoutManager, WmShellObserver implementation:
 
 void PanelLayoutManager::OnOverviewModeEnded() {
   Relayout();
 }
 
 void PanelLayoutManager::OnShelfAlignmentChanged() {
   Relayout();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, WindowObserver implementation:
 
-void PanelLayoutManager::OnWindowPropertyChanged(
-    wm::WmWindow* window,
-    wm::WmWindowProperty property) {
+void PanelLayoutManager::OnWindowPropertyChanged(WmWindow* window,
+                                                 WmWindowProperty property) {
   // Trigger a relayout to position the panels whenever the panel icon is set
   // or changes.
-  if (property == wm::WmWindowProperty::SHELF_ID)
+  if (property == WmWindowProperty::SHELF_ID)
     Relayout();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, WindowStateObserver implementation:
 
 void PanelLayoutManager::OnPostWindowStateTypeChange(
     wm::WindowState* window_state,
     wm::WindowStateType old_type) {
   // If the shelf is currently hidden then windows will not actually be shown
   // but the set to restore when the shelf becomes visible is updated.
   if (restore_windows_on_shelf_visible_) {
     if (window_state->IsMinimized()) {
       MinimizePanel(window_state->window());
       restore_windows_on_shelf_visible_->Remove(window_state->window());
     } else {
       restore_windows_on_shelf_visible_->Add(window_state->window());
     }
     return;
   }
 
   if (window_state->IsMinimized())
     MinimizePanel(window_state->window());
   else
     RestorePanel(window_state->window());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, wm::WmActivationObserver implementation:
+// PanelLayoutManager, WmActivationObserver implementation:
 
-void PanelLayoutManager::OnWindowActivated(wm::WmWindow* gained_active,
-                                           wm::WmWindow* lost_active) {
+void PanelLayoutManager::OnWindowActivated(WmWindow* gained_active,
+                                           WmWindow* lost_active) {
   // Ignore if the panel that is not managed by this was activated.
   if (gained_active && gained_active->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
       gained_active->GetParent() == panel_container_) {
     UpdateStacking(gained_active);
     UpdateCallouts();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, wm::WmDisplayObserver::Observer implementation:
+// PanelLayoutManager, WmDisplayObserver::Observer implementation:
 
 void PanelLayoutManager::OnDisplayConfigurationChanged() {
   Relayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, ShelfLayoutManagerObserver implementation:
 
 void PanelLayoutManager::WillChangeVisibilityState(
     ShelfVisibilityState new_state) {
   // On entering / leaving full screen mode the shelf visibility state is
   // changed to / from SHELF_HIDDEN. In this state, panel windows should hide
   // to allow the full-screen application to use the full screen.
   bool shelf_hidden = new_state == ash::SHELF_HIDDEN;
   if (!shelf_hidden) {
     if (restore_windows_on_shelf_visible_) {
-      std::unique_ptr<wm::WmWindowTracker> restore_windows(
+      std::unique_ptr<WmWindowTracker> restore_windows(
           std::move(restore_windows_on_shelf_visible_));
-      for (wm::WmWindow* window : restore_windows->windows())
+      for (WmWindow* window : restore_windows->windows())
         RestorePanel(window);
     }
     return;
   }
 
   if (restore_windows_on_shelf_visible_)
     return;
-  std::unique_ptr<wm::WmWindowTracker> minimized_windows(
-      new wm::WmWindowTracker);
+  std::unique_ptr<WmWindowTracker> minimized_windows(new WmWindowTracker);
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end();) {
-    wm::WmWindow* window = iter->window;
+    WmWindow* window = iter->window;
     // Minimizing a panel window may remove it from the panel_windows_ list.
     // Advance the iterator before minimizing it: http://crbug.com/393047.
     ++iter;
     if (window != dragged_panel_ && window->IsVisible()) {
       minimized_windows->Add(window);
       window->GetWindowState()->Minimize();
     }
   }
   restore_windows_on_shelf_visible_ = std::move(minimized_windows);
 }
 
 void PanelLayoutManager::OnShelfIconPositionsChanged() {
   // TODO: As this is called for every animation step now. Relayout needs to be
   // updated to use current icon position instead of use the ideal bounds so
   // that the panels slide with their icons instead of jumping.
   Relayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager private implementation:
 
-void PanelLayoutManager::MinimizePanel(wm::WmWindow* panel) {
+void PanelLayoutManager::MinimizePanel(WmWindow* panel) {
   panel->SetVisibilityAnimationType(
       wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
   ui::Layer* layer = panel->GetLayer();
   ui::ScopedLayerAnimationSettings panel_slide_settings(layer->GetAnimator());
   panel_slide_settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   panel_slide_settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(kPanelSlideDurationMilliseconds));
   gfx::Rect bounds(panel->GetBounds());
   bounds.Offset(GetSlideInAnimationOffset(shelf_->GetAlignment()));
   panel->SetBoundsDirect(bounds);
   panel->Hide();
   layer->SetOpacity(0);
   if (panel->IsActive())
     panel->Deactivate();
   Relayout();
 }
 
-void PanelLayoutManager::RestorePanel(wm::WmWindow* panel) {
+void PanelLayoutManager::RestorePanel(WmWindow* panel) {
   PanelList::iterator found =
       std::find(panel_windows_.begin(), panel_windows_.end(), panel);
   DCHECK(found != panel_windows_.end());
   found->slide_in = true;
   Relayout();
 }
 
 void PanelLayoutManager::Relayout() {
   if (!shelf_)
     return;
 
   // Suppress layouts during overview mode because changing window bounds
   // interfered with overview mode animations. However, layouts need to be done
   // when the WindowSelectorController is restoring minimized windows so that
   // they actually become visible.
-  wm::WmGlobals* globals = panel_container_->GetGlobals();
-  if (in_layout_ || (globals->IsOverviewModeSelecting() &&
-                     !globals->IsOverviewModeRestoringMinimizedWindows())) {
+  WmShell* shell = panel_container_->GetShell();
+  if (in_layout_ || (shell->IsOverviewModeSelecting() &&
+                     !shell->IsOverviewModeRestoringMinimizedWindows())) {
     return;
   }
 
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
   const wm::ShelfAlignment alignment = shelf_->GetAlignment();
   const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   gfx::Rect shelf_bounds = panel_container_->ConvertRectFromScreen(
       shelf_->GetWindow()->GetBoundsInScreen());
   int panel_start_bounds = kPanelIdealSpacing;
   int panel_end_bounds =
       horizontal ? panel_container_->GetBounds().width() - kPanelIdealSpacing
                  : panel_container_->GetBounds().height() - kPanelIdealSpacing;
-  wm::WmWindow* active_panel = nullptr;
+  WmWindow* active_panel = nullptr;
   std::vector<VisiblePanelPositionInfo> visible_panels;
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
-    wm::WmWindow* panel = iter->window;
+    WmWindow* panel = iter->window;
     iter->callout_widget->SetAlignment(alignment);
 
     // Consider the dragged panel as part of the layout as long as it is
     // touching the shelf.
     if ((!panel->IsVisible() && !iter->slide_in) ||
         (panel == dragged_panel_ &&
          !BoundsAdjacent(panel->GetBounds(), shelf_bounds))) {
       continue;
     }
 
@@ skipping 10 matching lines @@
     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->IsFocused() ||
-        panel->Contains(panel->GetGlobals()->GetFocusedWindow())) {
+        panel->Contains(panel->GetShell()->GetFocusedWindow())) {
       DCHECK(!active_panel);
       active_panel = panel;
     }
     icon_bounds = panel_container_->ConvertRectFromScreen(icon_bounds);
     gfx::Point icon_origin = icon_bounds.origin();
     VisiblePanelPositionInfo position_info;
     int icon_start = horizontal ? icon_origin.x() : icon_origin.y();
     int icon_end =
         icon_start + (horizontal ? icon_bounds.width() : icon_bounds.height());
     position_info.major_length =
@@ skipping 78 matching lines @@
       // If the shelf moved don't animate, move immediately to the new
       // target location.
       visible_panels[i].window->SetBoundsDirect(bounds);
     }
   }
 
   UpdateStacking(active_panel);
   UpdateCallouts();
 }
 
-void PanelLayoutManager::UpdateStacking(wm::WmWindow* active_panel) {
+void PanelLayoutManager::UpdateStacking(WmWindow* active_panel) {
   if (!active_panel) {
     if (!last_active_panel_)
       return;
     active_panel = last_active_panel_;
   }
 
   // We want to to stack the panels like a deck of cards:
   // ,--,--,--,-------.--.--.
   // |  |  |  |       |  |  |
   // |  |  |  |       |  |  |
   //
   // We use the middle of each panel to figure out how to stack the panels. This
   // allows us to update the stacking when a panel is being dragged around by
   // the titlebar--even though it doesn't update the shelf icon positions, we
   // still want the visual effect.
-  std::map<int, wm::WmWindow*> window_ordering;
+  std::map<int, WmWindow*> window_ordering;
   const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   for (PanelList::const_iterator it = panel_windows_.begin();
        it != panel_windows_.end(); ++it) {
     gfx::Rect bounds = it->window->GetBounds();
     window_ordering.insert(
         std::make_pair(horizontal ? bounds.x() + bounds.width() / 2
                                   : bounds.y() + bounds.height() / 2,
                        it->window));
   }
 
-  wm::WmWindow* previous_panel = nullptr;
-  for (std::map<int, wm::WmWindow*>::const_iterator it =
-           window_ordering.begin();
+  WmWindow* previous_panel = nullptr;
+  for (std::map<int, WmWindow*>::const_iterator it = window_ordering.begin();
        it != window_ordering.end() && it->second != active_panel; ++it) {
     if (previous_panel)
       panel_container_->StackChildAbove(it->second, previous_panel);
     previous_panel = it->second;
   }
 
   previous_panel = NULL;
-  for (std::map<int, wm::WmWindow*>::const_reverse_iterator it =
+  for (std::map<int, WmWindow*>::const_reverse_iterator it =
            window_ordering.rbegin();
        it != window_ordering.rend() && it->second != active_panel; ++it) {
     if (previous_panel)
       panel_container_->StackChildAbove(it->second, previous_panel);
     previous_panel = it->second;
   }
 
   panel_container_->StackChildAtTop(active_panel);
   if (dragged_panel_ && dragged_panel_->GetParent() == panel_container_)
     panel_container_->StackChildAtTop(dragged_panel_);
   last_active_panel_ = active_panel;
 }
 
 void PanelLayoutManager::UpdateCallouts() {
   const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
-    wm::WmWindow* panel = iter->window;
+    WmWindow* panel = iter->window;
     views::Widget* callout_widget = iter->callout_widget;
-    wm::WmWindow* callout_widget_window =
-        wm::WmLookup::Get()->GetWindowForWidget(callout_widget);
+    WmWindow* callout_widget_window =
+        WmLookup::Get()->GetWindowForWidget(callout_widget);
 
     gfx::Rect current_bounds = panel->GetBoundsInScreen();
     gfx::Rect bounds =
         panel->GetParent()->ConvertRectToScreen(panel->GetTargetBounds());
     gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
     if (icon_bounds.IsEmpty() || !panel->GetLayer()->GetTargetVisibility() ||
         panel == dragged_panel_ || !show_callout_widgets_) {
       callout_widget->Hide();
       callout_widget_window->GetLayer()->SetOpacity(0);
       continue;
@@ skipping 61 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // keyboard::KeyboardControllerObserver implementation:
 
 void PanelLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   gfx::Rect parent_bounds = panel_container_->GetBounds();
   int available_space = parent_bounds.height() - keyboard_bounds.height();
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
-    wm::WmWindow* panel = iter->window;
+    WmWindow* panel = iter->window;
     wm::WindowState* panel_state = panel->GetWindowState();
     if (keyboard_bounds.height() > 0) {
       // Save existing bounds, so that we can restore them when the keyboard
       // hides.
       panel_state->SaveCurrentBoundsForRestore();
 
       gfx::Rect panel_bounds =
           panel->GetParent()->ConvertRectToScreen(panel->GetTargetBounds());
       int delta = panel_bounds.height() - available_space;
       // Ensure panels are not pushed above the parent boundaries, shrink any
       // panels that violate this constraint.
       if (delta > 0) {
         panel->SetBoundsDirect(
             gfx::Rect(panel_bounds.x(), panel_bounds.y() + delta,
                       panel_bounds.width(), panel_bounds.height() - delta));
       }
     } else if (panel_state->HasRestoreBounds()) {
       // Keyboard hidden, restore original bounds if they exist.
       panel->SetBoundsDirect(panel_state->GetRestoreBoundsInScreen());
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 }  // namespace ash