Shuffles and renames ash/common/wm classes

ash/aura/wm_shelf_aura.cc

 // Copyright 2016 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/aura/wm_shelf_aura.h"
+#include "ash/aura/wm_shelf_aura.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/shelf/wm_shelf_observer.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_window.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace wm {
 
 WmShelfAura::WmShelfAura(Shelf* shelf)
     : shelf_(shelf), shelf_layout_manager_(shelf->shelf_layout_manager()) {
   shelf_layout_manager_->AddObserver(this);
   shelf_->AddIconObserver(this);
 }
@@ skipping 27 matching lines @@
 
 ShelfVisibilityState WmShelfAura::GetVisibilityState() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state()
                                : SHELF_HIDDEN;
 }
 
 void WmShelfAura::UpdateIconPositionForWindow(WmWindow* window) {
   shelf_->UpdateIconPositionForWindow(WmWindowAura::GetAuraWindow(window));
 }
 
-gfx::Rect WmShelfAura::GetScreenBoundsOfItemIconForWindow(
-    wm::WmWindow* window) {
+gfx::Rect WmShelfAura::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   return shelf_->GetScreenBoundsOfItemIconForWindow(
       WmWindowAura::GetAuraWindow(window));
 }
 
 void WmShelfAura::AddObserver(WmShelfObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 15 matching lines @@
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     WillChangeVisibilityState(new_state));
 }
 
 void WmShelfAura::OnShelfIconPositionsChanged() {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
 }
 
 }  // namespace wm
 }  // namespace ash