Shuffles and renames ash/common/wm classes

ash/shelf/shelf_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/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
 #include <vector>
 
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/ash_switches.h"
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/shelf/wm_shelf_util.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm/wm_root_window_controller.h"
-#include "ash/common/wm/wm_root_window_controller_observer.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_root_window_controller_observer.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_bezel_event_filter.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/command_line.h"
@@ skipping 141 matching lines @@
 
 // ShelfLayoutManager::RootWindowControllerObserverImpl ------------------------
 
 // NOTE: Some other layout managers also observe for OnShelfAlignmentChanged()
 // via WmRootWindowControllerObserver instead of via ShellObserver. There are
 // implicit assumptions that these layout managers run in order. In order to
 // preserve the ordering, OnShelfAlignmentChanged() is implemented here in terms
 // of a WmRootWindowControllerObserver instead of a ShellObserver. This gives us
 // a sane ordering (or at least ordering as we've always had it in ash).
 class ShelfLayoutManager::RootWindowControllerObserverImpl
-    : public wm::WmRootWindowControllerObserver {
+    : public WmRootWindowControllerObserver {
  public:
   explicit RootWindowControllerObserverImpl(
       ShelfLayoutManager* shelf_layout_manager)
       : shelf_layout_manager_(shelf_layout_manager) {}
   ~RootWindowControllerObserverImpl() override {}
 
   // WmRootWindowControllerObserver:
   void OnShelfAlignmentChanged() override {
     shelf_layout_manager_->LayoutShelf();
   }
@@ skipping 19 matching lines @@
       gesture_drag_amount_(0.f),
       gesture_drag_auto_hide_state_(SHELF_AUTO_HIDE_SHOWN),
       update_shelf_observer_(NULL),
       chromevox_panel_height_(0),
       duration_override_in_ms_(0) {
   Shell::GetInstance()->AddShellObserver(this);
 
   if (!Shell::GetInstance()->in_mus()) {
     root_window_controller_observer_.reset(
         new RootWindowControllerObserverImpl(this));
-    wm::WmWindowAura::Get(root_window_)
+    WmWindowAura::Get(root_window_)
         ->GetRootWindowController()
         ->AddObserver(root_window_controller_observer_.get());
   }
   Shell::GetInstance()->lock_state_controller()->AddObserver(this);
   aura::client::GetActivationClient(root_window_)->AddObserver(this);
   Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(this);
 }
 
 ShelfLayoutManager::~ShelfLayoutManager() {
   if (update_shelf_observer_)
     update_shelf_observer_->Detach();
 
   FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,
                     WillDeleteShelfLayoutManager());
   Shell::GetInstance()->RemoveShellObserver(this);
   Shell::GetInstance()->lock_state_controller()->RemoveObserver(this);
   Shell::GetInstance()->
       session_state_delegate()->RemoveSessionStateObserver(this);
   if (root_window_controller_observer_) {
-    wm::WmWindowAura::Get(root_window_)
+    WmWindowAura::Get(root_window_)
         ->GetRootWindowController()
         ->RemoveObserver(root_window_controller_observer_.get());
   }
 }
 
 void ShelfLayoutManager::PrepareForShutdown() {
   in_shutdown_ = true;
   // Clear all event filters, otherwise sometimes those filters may catch
   // synthesized mouse event and cause crashes during the shutdown.
   set_workspace_controller(NULL);
@@ skipping 929 matching lines @@
   UpdateBoundsAndOpacity(target_bounds, true, NULL);
   UpdateVisibilityState();
 }
 
 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() {
   UpdateVisibilityState();
   LayoutShelf();
 }
 
 }  // namespace ash