| 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 e06488d52170faa183572205569e1532fa306a52..2ece5e1af71d0d3d91d941a59fb179daec0441d8 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>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| @@ -18,6 +19,7 @@
|
|
|
| class AppListControllerDelegate;
|
| class AppsModelBuilder;
|
| +class ChromeSigninDelegate;
|
| class Profile;
|
|
|
| namespace app_list {
|
| @@ -44,13 +46,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,
|
| @@ -71,6 +77,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 app_list::SigninDelegateObserver:
|
| virtual void OnSigninSuccess() OVERRIDE;
|
| @@ -80,7 +88,7 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) 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_;
|
|
|