Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.h

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: small fixups Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0b5d121dfbe3c455b6759b53ff2b7932b91e774a..3d2cccc02f7d8359a5619220eb16e6db0c4d8940 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"
@@ -38,10 +39,11 @@ class AppListViewDelegate : public app_list::AppListViewDelegate {
// The delegate will take ownership of the controller.
AppListViewDelegate(AppListControllerDelegate* controller, Profile* profile);
virtual ~AppListViewDelegate();
+ virtual void SetProfileByPath(base::FilePath profile_path) OVERRIDE;
private:
// 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,
@@ -59,17 +61,18 @@ class AppListViewDelegate : public app_list::AppListViewDelegate {
virtual void ViewClosing() OVERRIDE;
virtual void ViewActivationChanged(bool active) 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;
+ virtual void ShowForProfileByPath(base::FilePath profile_path) OVERRIDE;
+ virtual void UpdateModelWithCurrentProfiles() 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_;
#if defined(USE_ASH)
scoped_ptr<AppSyncUIStateWatcher> app_sync_ui_state_watcher_;

Powered by Google App Engine
This is Rietveld 408576698