mash: Move ash/common/wm/shelf to ash/common/shelf

ash/shelf/shelf.cc

 // Copyright 2013 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.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/aura/wm_shelf_aura.h"
+#include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/shelf/wm_shelf_util.h"
 #include "ash/focus_cycler.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_navigator.h"
@@ skipping 23 matching lines @@
              ShelfWidget* shelf_widget)
     : delegate_(shelf_delegate),
       shelf_widget_(shelf_widget),
       shelf_view_(new ShelfView(shelf_model, delegate_, this)),
       shelf_locking_manager_(this) {
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
   // This has to be done after the ShelfWidget and ShelfLayoutManager have
   // been created.
-  wm_shelf_.reset(new wm::WmShelfAura(this));
+  wm_shelf_.reset(new WmShelfAura(this));
 }
 
 Shelf::~Shelf() {
   delegate_->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
   return Shelf::ForWindow(Shell::GetPrimaryRootWindow());
 }
@@ skipping 10 matching lines @@
   for (aura::Window* window : Shell::GetInstance()->GetAllRootWindows()) {
     RootWindowSettings* settings = GetRootWindowSettings(window);
     if (settings->display_id == display_id && settings->controller) {
       ShelfWidget* shelf_widget = settings->controller->shelf_widget();
       return shelf_widget ? shelf_widget->shelf() : nullptr;
     }
   }
   return nullptr;
 }
 
-void Shelf::SetAlignment(wm::ShelfAlignment alignment) {
+void Shelf::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
-      alignment != wm::SHELF_ALIGNMENT_BOTTOM_LOCKED) {
+      alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_.set_stored_alignment(alignment);
     return;
   }
 
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   shelf_widget_->OnShelfAlignmentChanged();
   delegate_->OnShelfAlignmentChanged(this);
   Shell::GetInstance()->OnShelfAlignmentChanged(
       shelf_widget_->GetNativeWindow()->GetRootWindow());
   // ShelfLayoutManager will resize the shelf.
 }
 
 bool Shelf::IsHorizontalAlignment() const {
-  return wm::IsHorizontalAlignment(alignment_);
+  return ::ash::IsHorizontalAlignment(alignment_);
 }
 
 void Shelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;
 
   auto_hide_behavior_ = auto_hide_behavior;
   delegate_->OnShelfAutoHideBehaviorChanged(this);
   Shell::GetInstance()->OnShelfAutoHideBehaviorChanged(
       shelf_widget_->GetNativeWindow()->GetRootWindow());
@@ skipping 107 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash