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..c8b8c1b0cc4b31cf03951fe06658a0923159fdc1 100644 |
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h |
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h |
@@ -6,6 +6,7 @@ |
#define CHROME_BROWSER_UI_APP_LIST_APP_LIST_VIEW_DELEGATE_H_ |
#include <string> |
+#include <vector> |
tapted
2013/09/10 00:29:26
nit: can this go in the .cc?
calamity
2013/09/10 22:50:46
Done.
|
#include "base/basictypes.h" |
#include "base/callback_forward.h" |
@@ -18,6 +19,7 @@ |
class AppListControllerDelegate; |
class AppsModelBuilder; |
+class ChromeSigninDelegate; |
class Profile; |
namespace app_list { |
@@ -49,11 +51,17 @@ class AppListViewDelegate : public app_list::AppListViewDelegate, |
AppListViewDelegate(AppListControllerDelegate* controller, Profile* profile); |
virtual ~AppListViewDelegate(); |
+ // Overridden from app_list::AppListViewDelegate: |
+ virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE; |
+ |
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 InitModel(app_list::AppListModel* model) OVERRIDE; |
virtual app_list::SigninDelegate* GetSigninDelegate() OVERRIDE; |
virtual void GetShortcutPathForApp( |
const std::string& app_id, |
@@ -73,6 +81,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 +90,12 @@ 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<ChromeSigninDelegate> signin_delegate_; |
scoped_ptr<AppsModelBuilder> apps_builder_; |
scoped_ptr<app_list::SearchController> search_controller_; |
scoped_ptr<AppListControllerDelegate> controller_; |