Shuffles and renames ash/common/wm classes

ash/common/wm/default_state.cc

 // Copyright 2014 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/default_state.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
-#include "ash/common/wm/wm_globals.h"
-#include "ash/common/wm/wm_root_window_controller.h"
 #include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 // This specifies how much percent (30%) of a window rect
 // must be visible when the window is added to the workspace.
 const float kMinimumPercentOnScreenArea = 0.3f;
@@ skipping 18 matching lines @@
   // display it should be restored, so this is best guess.
   // TODO(oshima): Restore information should contain the
   // work area information like WindowResizer does for the
   // last window location.
   gfx::Rect display_area =
       window_state->window()->GetDisplayNearestWindow().bounds();
 
   if (!display_area.Intersects(restore_bounds)) {
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayMatching(restore_bounds);
-    WmGlobals* globals = window_state->window()->GetGlobals();
-    WmWindow* new_root = globals->GetRootWindowForDisplayId(display.id());
+    WmShell* shell = window_state->window()->GetShell();

[James Cook, 2016/06/03 20:10:47]

Thanks for fixing local variable names.

+    WmWindow* new_root = shell->GetRootWindowForDisplayId(display.id());
     if (new_root != window_state->window()->GetRootWindow()) {
       WmWindow* new_container = new_root->GetChildByShellWindowId(
           window_state->window()->GetParent()->GetShellWindowId());
       new_container->AddChild(window_state->window());
     }
   }
 }
 
-DockedWindowLayoutManager* GetDockedWindowLayoutManager(WmGlobals* globals) {
-  return DockedWindowLayoutManager::Get(globals->GetActiveWindow());
+DockedWindowLayoutManager* GetDockedWindowLayoutManager(WmShell* shell) {
+  return DockedWindowLayoutManager::Get(shell->GetActiveWindow());
 }
 
 class ScopedPreferredAlignmentResetter {
  public:
   ScopedPreferredAlignmentResetter(DockedAlignment dock_alignment,
                                    DockedWindowLayoutManager* dock_layout)
       : docked_window_layout_manager_(dock_layout) {
     docked_window_layout_manager_->set_preferred_alignment(dock_alignment);
   }
   ~ScopedPreferredAlignmentResetter() {
@@ skipping 20 matching lines @@
   }
 
  private:
   DockedWindowLayoutManager* docked_window_layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedDockedLayoutEventSourceResetter);
 };
 
 void CycleSnapDock(WindowState* window_state, WMEventType event) {
   DockedWindowLayoutManager* dock_layout =
-      GetDockedWindowLayoutManager(window_state->window()->GetGlobals());
+      GetDockedWindowLayoutManager(window_state->window()->GetShell());
   wm::WindowStateType desired_snap_state =
       event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT
           ? wm::WINDOW_STATE_TYPE_LEFT_SNAPPED
           : wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED;
   DockedAlignment desired_dock_alignment =
       event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT ? DOCKED_ALIGNMENT_LEFT
                                              : DOCKED_ALIGNMENT_RIGHT;
   DockedAlignment current_dock_alignment =
       dock_layout ? dock_layout->CalculateAlignment() : DOCKED_ALIGNMENT_NONE;
 
@@ skipping 606 matching lines @@
     gfx::Rect center_in_parent = GetDisplayWorkAreaBoundsInParent(window);
     center_in_parent.ClampToCenteredSize(window->GetBounds().size());
     window_state->SetBoundsDirectAnimated(center_in_parent);
   }
   // Centering window is treated as if a user moved and resized the window.
   window_state->set_bounds_changed_by_user(true);
 }
 
 }  // namespace wm
 }  // namespace ash