[Win] Revert the profile switcher code from the jumplist.

chrome/browser/jumplist_win.h

Index: chrome/browser/jumplist_win.h
diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h
index e8931da1fcbc381def79021252401cf8a383cb94..3d2d49a8b0804cc93d8d200259cd7bd09abd52cf 100644
--- a/chrome/browser/jumplist_win.h
+++ b/chrome/browser/jumplist_win.h
@@ -17,22 +17,18 @@
 #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"
+#include "content/public/browser/notification_registrar.h"

[tapted, 2015/02/18 03:07:18]

optinal-nit: The registrar can probably still be forward-declared in the header
(and this moved to .cc) since it's scoped_ptr. But there's so little including
this I doubt it's worthwhile.

[noms (inactive), 2015/02/19 15:41:34]

Done.

 
 namespace chrome {
 struct FaviconImageResult;
 }
 
-namespace content {
-class NotificationRegistrar;
-}
-
 class PrefChangeRegistrar;
 class Profile;
 
@@ -54,7 +50,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 +70,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 +134,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 +162,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 +178,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);
 };