Cleanup ash shelf accessor functions.

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/focus_cycler.h"
 #include "ash/root_window_controller.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"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
@@ skipping 22 matching lines @@
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
   delegate_->OnShelfCreated(this);
 }
 
 Shelf::~Shelf() {
   delegate_->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
-  ShelfWidget* shelf_widget =
-      RootWindowController::ForShelf(Shell::GetPrimaryRootWindow())->shelf();
+  return Shelf::ForWindow(Shell::GetPrimaryRootWindow());
+}
+
+// static
+Shelf* Shelf::ForWindow(const aura::Window* window) {
+  ShelfWidget* shelf_widget = RootWindowController::ForWindow(window)->shelf();
   return shelf_widget ? shelf_widget->shelf() : NULL;
 }
 
-// static
-Shelf* Shelf::ForWindow(aura::Window* window) {
-  ShelfWidget* shelf_widget = RootWindowController::ForShelf(window)->shelf();
-  return shelf_widget ? shelf_widget->shelf() : NULL;
-}
-
 void Shelf::SetAlignment(ShelfAlignment alignment) {
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   // ShelfLayoutManager will resize the shelf.
 }
 
 gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(
     const aura::Window* window) {
   ShelfID id = GetShelfIDForWindow(window);
   gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
@@ skipping 101 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash