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

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

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove junk from list_model.h 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_service_impl.h
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.h b/chrome/browser/ui/app_list/app_list_service_impl.h
index 5f7d70f34f322297c6ae513bc38fcc7776bb5b4b..11d5c493cbd52bcc81dd856a6b8bc45271680f6f 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.h
+++ b/chrome/browser/ui/app_list/app_list_service_impl.h
@@ -15,8 +15,6 @@
#include "chrome/browser/profiles/profile_info_cache_observer.h"
#include "chrome/browser/profiles/profile_loader.h"
#include "chrome/browser/ui/app_list/app_list_service.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
namespace base {
class FilePath;
@@ -29,13 +27,18 @@ class NotificationDetails;
// Parts of the AppListService implementation shared between platforms.
class AppListServiceImpl : public AppListService,
- public ProfileInfoCacheObserver,
- public content::NotificationObserver {
+ public ProfileInfoCacheObserver{
tapted 2013/08/05 03:01:39 space before {
calamity 2013/08/08 04:52:12 Done.
public:
static void RecordAppListLaunch();
static void RecordAppListAppLaunch();
static void SendAppListStats();
+ // Shows the app list for the profile at the current |profile_path|. If the
+ // profile has not been loaded, this will load the profile and then show the
+ // app list.
+ virtual void Show() OVERRIDE;
tapted 2013/08/05 03:01:39 nit: there should be a comment saying these are ov
calamity 2013/08/08 04:52:12 AppListControllerDelegateWin calls Show and SetPro
+ virtual void SetProfilePath(const base::FilePath& profile_path) OVERRIDE;
+
protected:
AppListServiceImpl();
virtual ~AppListServiceImpl();
@@ -63,8 +66,6 @@ class AppListServiceImpl : public AppListService,
// Returns the app list path configured in BrowserProcess::local_state().
virtual base::FilePath GetProfilePath(
const base::FilePath& user_data_dir) OVERRIDE;
- virtual void SetProfilePath(const base::FilePath& profile_path) OVERRIDE;
- virtual void Show() OVERRIDE;
virtual void EnableAppList(Profile* initial_profile) OVERRIDE;
virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE;
@@ -83,11 +84,6 @@ class AppListServiceImpl : public AppListService,
virtual void OnProfileWillBeRemoved(
const base::FilePath& profile_path) OVERRIDE;
- // content::NotificationObserver
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
-
// The profile the AppList is currently displaying.
Profile* profile_;
@@ -98,7 +94,6 @@ class AppListServiceImpl : public AppListService,
int pending_profile_loads_;
base::WeakPtrFactory<AppListServiceImpl> weak_factory_;
- content::NotificationRegistrar registrar_;
ProfileLoader profile_loader_;

Powered by Google App Engine
This is Rietveld 408576698