mash: Move more shelf files to ash/common/shelf.

ash/common/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 "ash/common/shelf/shelf.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_navigator.h"
 #include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.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 "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
@@ skipping 14 matching lines @@
 Shelf::~Shelf() {
   WmShell::Get()->shelf_delegate()->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
   return Shelf::ForWindow(WmShell::Get()->GetPrimaryRootWindow());
 }
 
 // static
-Shelf* Shelf::ForWindow(const WmWindow* window) {
-  const aura::Window* aura_window = WmWindowAura::GetAuraWindow(window);
-  ShelfWidget* shelf_widget =
-      RootWindowController::ForWindow(aura_window)->shelf_widget();
-  return shelf_widget ? shelf_widget->shelf() : nullptr;
+Shelf* Shelf::ForWindow(WmWindow* window) {
+  return window->GetRootWindowController()->GetShelf()->shelf();
 }
 
 void Shelf::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_.set_stored_alignment(alignment);
     return;
@@ skipping 99 matching lines @@
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 void Shelf::UpdateShelfItemBackground(int alpha) {
   shelf_view_->UpdateShelfItemBackground(alpha);
 }
 
 }  // namespace ash