mash: Move ownership of ShelfDelegate to WmShell

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_window_aura.h"
+#include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_navigator.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
-#include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.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"
 #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"
 
 namespace ash {
 
 const char Shelf::kNativeViewName[] = "ShelfView";
 
 Shelf::Shelf(ShelfModel* shelf_model,
-             ShelfDelegate* shelf_delegate,
              WmShelf* wm_shelf,
              ShelfWidget* shelf_widget)
-    : delegate_(shelf_delegate),
-      wm_shelf_(wm_shelf),
+    : wm_shelf_(wm_shelf),
       shelf_widget_(shelf_widget),
-      shelf_view_(new ShelfView(shelf_model, delegate_, wm_shelf, this)),
+      shelf_view_(new ShelfView(shelf_model,
+                                WmShell::Get()->shelf_delegate(),
+                                wm_shelf,
+                                this)),
       shelf_locking_manager_(wm_shelf) {
   DCHECK(wm_shelf_);
   shelf_view_->Init();
   shelf_widget_->GetContentsView()->AddChildView(shelf_view_);
   shelf_widget_->GetNativeView()->SetName(kNativeViewName);
 }
 
 Shelf::~Shelf() {
-  delegate_->OnShelfDestroyed(this);
+  WmShell::Get()->shelf_delegate()->OnShelfDestroyed(this);
 }
 
 // static
 Shelf* Shelf::ForPrimaryDisplay() {
   return Shelf::ForWindow(Shell::GetPrimaryRootWindow());
 }
 
 // static
 Shelf* Shelf::ForWindow(const aura::Window* window) {
   ShelfWidget* shelf_widget =
       RootWindowController::ForWindow(window)->shelf_widget();
   return shelf_widget ? shelf_widget->shelf() : nullptr;
 }
 
 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;
   }
 
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   shelf_widget_->OnShelfAlignmentChanged();
-  delegate_->OnShelfAlignmentChanged(this);
+  WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(this);
   Shell::GetInstance()->OnShelfAlignmentChanged(
       WmWindowAura::Get(shelf_widget_->GetNativeWindow()->GetRootWindow()));
   // ShelfLayoutManager will resize the shelf.
 }
 
 bool Shelf::IsHorizontalAlignment() const {
   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);
+  WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(this);
   Shell::GetInstance()->OnShelfAutoHideBehaviorChanged(
       WmWindowAura::Get(shelf_widget_->GetNativeWindow()->GetRootWindow()));
 }
 
 ShelfAutoHideState Shelf::GetAutoHideState() const {
   return shelf_widget_->shelf_layout_manager()->auto_hide_state();
 }
 
 ShelfVisibilityState Shelf::GetVisibilityState() const {
   return shelf_widget_->shelf_layout_manager()->visibility_state();
@@ skipping 97 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash