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 c2576aaf59a285c1d3b46e55bb6b8b62bb00abea..6b95d3c3c6bf1c850fa789a7af8de96d73cd95af 100644 |
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h |
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h |
@@ -12,6 +12,7 @@ |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/profiles/profile_info_cache_observer.h" |
+#include "chrome/browser/ui/app_list/chrome_signin_delegate.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "ui/app_list/app_list_view_delegate.h" |
@@ -50,10 +51,14 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
virtual ~AppListViewDelegate(); |
private: |
+ // Registers the current profile for notifications. |
+ void RegisterForNotifications(); |
+ // Updates the app list's current profile and ProfileMenuItems. |
void OnProfileChanged(); |
// Overridden from app_list::AppListViewDelegate: |
- virtual void SetModel(app_list::AppListModel* model) OVERRIDE; |
+ virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE; |
+ virtual void InitModel(app_list::AppListModel* model) OVERRIDE; |
virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE; |
virtual void GetShortcutPathForApp( |
const std::string& app_id, |
@@ -73,6 +78,8 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
virtual void OpenSettings() OVERRIDE; |
virtual void OpenHelp() OVERRIDE; |
virtual void OpenFeedback() OVERRIDE; |
+ virtual void ShowForProfileByPath( |
+ const base::FilePath& profile_path) OVERRIDE; |
// Overridden from content::NotificationObserver: |
virtual void Observe(int type, |
@@ -80,11 +87,11 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
const content::NotificationDetails& details) OVERRIDE; |
// Overridden from ProfileInfoCacheObserver: |
+ virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; |
virtual void OnProfileNameChanged( |
const base::FilePath& profile_path, |
const base::string16& old_profile_name) OVERRIDE; |
- scoped_ptr<app_list::SigninDelegate> signin_delegate_; |
scoped_ptr<AppsModelBuilder> apps_builder_; |
scoped_ptr<app_list::SearchController> search_controller_; |
scoped_ptr<AppListControllerDelegate> controller_; |
@@ -92,6 +99,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
app_list::AppListModel* model_; // Weak. Owned by AppListView. |
content::NotificationRegistrar registrar_; |
+ ChromeSigninDelegate signin_delegate_; |
#if defined(USE_ASH) |
scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_; |
#endif |