Index: chrome/browser/ui/app_list/app_list_view_delegate.h |
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h |
index 0a7155bef1f53cbf54f523e0f48f416970a739c3..3964e73d612f3fe783c4590e05550aecc9ce16cf 100644 |
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h |
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h |
@@ -11,7 +11,10 @@ |
#include "base/callback_forward.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
+#include "content/public/browser/notification_observer.h" |
+#include "content/public/browser/notification_registrar.h" |
#include "ui/app_list/app_list_view_delegate.h" |
+#include "ui/app_list/signin_delegate_observer.h" |
class AppListControllerDelegate; |
class AppsModelBuilder; |
@@ -25,6 +28,11 @@ namespace base { |
class FilePath; |
} |
+namespace content { |
+class NotificationDetails; |
+class NotificationSource; |
+} |
+ |
namespace gfx { |
class ImageSkia; |
} |
@@ -33,13 +41,17 @@ class ImageSkia; |
class AppSyncUIStateWatcher; |
#endif |
-class AppListViewDelegate : public app_list::AppListViewDelegate { |
+class AppListViewDelegate : public app_list::AppListViewDelegate, |
+ public app_list::SigninDelegateObserver, |
+ public content::NotificationObserver { |
public: |
// The delegate will take ownership of the controller. |
AppListViewDelegate(AppListControllerDelegate* controller, Profile* profile); |
virtual ~AppListViewDelegate(); |
private: |
+ void OnProfileChanged(); |
+ |
// Overridden from app_list::AppListViewDelegate: |
virtual void SetModel(app_list::AppListModel* model) OVERRIDE; |
virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE; |
@@ -58,18 +70,26 @@ class AppListViewDelegate : public app_list::AppListViewDelegate { |
virtual void Dismiss() OVERRIDE; |
virtual void ViewClosing() OVERRIDE; |
virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; |
- virtual string16 GetCurrentUserName() OVERRIDE; |
- virtual string16 GetCurrentUserEmail() OVERRIDE; |
virtual void OpenSettings() OVERRIDE; |
virtual void OpenHelp() OVERRIDE; |
virtual void OpenFeedback() OVERRIDE; |
+ // Overridden from app_list::SigninDelegateObserver: |
+ virtual void OnSigninSuccess() OVERRIDE; |
+ |
+ // Overridden from content::NotificationObserver: |
+ virtual void Observe(int type, |
+ const content::NotificationSource& source, |
+ const content::NotificationDetails& details) OVERRIDE; |
+ |
scoped_ptr<app_list::SigninDelegate> signin_delegate_; |
scoped_ptr<AppsModelBuilder> apps_builder_; |
scoped_ptr<app_list::SearchController> search_controller_; |
scoped_ptr<AppListControllerDelegate> controller_; |
Profile* profile_; |
+ app_list::AppListModel* model_; // Weak. Owned by AppListView. |
+ content::NotificationRegistrar registrar_; |
#if defined(USE_ASH) |
scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_; |
#endif |