Move ownership of the AppListViewDelegate into the AppListService

ui/app_list/views/app_list_view.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
@@ skipping 24 matching lines @@
 class HideViewAnimationObserver;
 class PaginationModel;
 class SpeechView;
 
 // AppListView is the top-level view and controller of app list UI. It creates
 // and hosts a AppsGridView and passes AppListModel to it for display.
 class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
                                     public AppListViewDelegateObserver,
                                     public SpeechUIModelObserver {
  public:
-  // Takes ownership of |delegate|.
+  // Does not take ownership of |delegate|.
   explicit AppListView(AppListViewDelegate* delegate);
   virtual ~AppListView();
 
   // Initializes the widget and use a given |anchor| plus an |anchor_offset| for
   // positioning.
   void InitAsBubbleAttachedToAnchor(gfx::NativeView parent,
                                     int initial_apps_page,
                                     views::View* anchor,
                                     const gfx::Vector2d& anchor_offset,
                                     views::BubbleBorder::Arrow arrow,
@@ skipping 93 matching lines @@
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
   virtual void OnWidgetVisibilityChanged(
       views::Widget* widget, bool visible) OVERRIDE;
   virtual void OnWidgetActivationChanged(
       views::Widget* widget, bool active) OVERRIDE;
 
   // Overridden from SpeechUIModelObserver:
   virtual void OnSpeechRecognitionStateChanged(
       SpeechRecognitionState new_state) OVERRIDE;
 
-  scoped_ptr<AppListViewDelegate> delegate_;
+  AppListViewDelegate* delegate_;  // Weak. Owned by AppListService.
 
   AppListMainView* app_list_main_view_;
   SpeechView* speech_view_;
 
   // The red "experimental" banner for the experimental app list.
   views::ImageView* experimental_banner_view_;
 
   // A semi-transparent white overlay that covers the app list while dialogs are
   // open.
   views::View* overlay_view_;
 
   ObserverList<AppListViewObserver> observers_;
   scoped_ptr<HideViewAnimationObserver> animation_observer_;
 
   // For UMA and testing. If non-null, triggered when the app list is painted.
   base::Closure next_paint_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_