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

Unified Diff: chrome/browser/jumplist_win.h

Issue 931853003: [Win] Revert the profile switcher code from the jumplist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: also remove kActivateExistingProfileBrowser Created 5 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/jumplist_win.h
diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h
index e8931da1fcbc381def79021252401cf8a383cb94..7e09e583b0694c7546c5c53d71fce9e98a0cf84a 100644
--- a/chrome/browser/jumplist_win.h
+++ b/chrome/browser/jumplist_win.h
@@ -17,13 +17,12 @@
#include "chrome/browser/history/history_service.h"
#include "chrome/browser/jumplist_updater_win.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
-#include "chrome/browser/profiles/avatar_menu.h"
-#include "chrome/browser/profiles/avatar_menu_observer.h"
#include "chrome/browser/sessions/tab_restore_service.h"
#include "chrome/browser/sessions/tab_restore_service_observer.h"
#include "components/history/core/browser/history_types.h"
#include "components/history/core/browser/top_sites_observer.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/notification_observer.h"
namespace chrome {
struct FaviconImageResult;
@@ -54,7 +53,6 @@ class Profile;
// always delete JumpList on UI thread (the same thread it got constructed on).
class JumpList : public TabRestoreServiceObserver,
public content::NotificationObserver,
- public AvatarMenuObserver,
public history::TopSitesObserver,
public base::RefCountedThreadSafe<
JumpList,
@@ -75,9 +73,6 @@ class JumpList : public TabRestoreServiceObserver,
// is destroyed.
void TabRestoreServiceDestroyed(TabRestoreService* service) override;
- // Overridden from AvatarMenuObserver:
- void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override;
-
// Cancel a pending jumplist update.
void CancelPendingUpdate();
@@ -142,10 +137,6 @@ class JumpList : public TabRestoreServiceObserver,
// loaded icons.
void CreateIconFiles(const ShellLinkItemList& item_list);
- // Called when the list of Profiles has changed. This function updates the
- // |profile_switcher_| ShellLinkItemList.
- void UpdateProfileSwitcher();
-
// history::TopSitesObserver implementation.
void TopSitesLoaded(history::TopSites* top_sites) override;
void TopSitesChanged(history::TopSites* top_sites) override;
@@ -174,10 +165,6 @@ class JumpList : public TabRestoreServiceObserver,
// protected by the list_lock_.
ShellLinkItemList recently_closed_pages_;
- // Items in the "People" category of the application JumpList, protected
- // by the list_lock_.
- ShellLinkItemList profile_switcher_;
-
// A list of URLs we need to retrieve their favicons,
// protected by the list_lock_.
typedef std::pair<std::string, scoped_refptr<ShellLinkItem> > URLPair;
@@ -194,13 +181,6 @@ class JumpList : public TabRestoreServiceObserver,
// For callbacks may be run after destruction.
base::WeakPtrFactory<JumpList> weak_ptr_factory_;
- // Contains data about existing Profiles.
- scoped_ptr<AvatarMenu> avatar_menu_;
-
- // Whether the experiment that is replacing "Most Visited" category with a
- // "People" category is enabled.
- bool use_profiles_category_;
-
DISALLOW_COPY_AND_ASSIGN(JumpList);
};
« no previous file with comments | « no previous file | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698