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

chrome/browser/jumplist_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_JUMPLIST_WIN_H_
 #define CHROME_BROWSER_JUMPLIST_WIN_H_
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/task/cancelable_task_tracker.h"
 #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;
 
 // A class which implements an application JumpList.
 // This class encapsulates operations required for updating an application
 // JumpList:
 // * Retrieving "Most Visited" pages from HistoryService;
 // * Retrieving strings from the application resource;
 // * Adding COM objects to JumpList, etc.
 //
 // This class observes the tabs and policies of the given Profile and updates
 // the JumpList whenever a change is detected.
 //
 // Updating a JumpList requires some file operations and it is not good to
 // update it in a UI thread. To solve this problem, this class posts to a
 // runnable method when it actually updates a JumpList.
 //
 // Note. base::CancelableTaskTracker is not thread safe, so we
 // 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,
                      content::BrowserThread::DeleteOnUIThread> {
  public:
   explicit JumpList(Profile* profile);
 
   // NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Observer callback for TabRestoreService::Observer to notify when a tab is
   // added or removed.
   void TabRestoreServiceChanged(TabRestoreService* service) override;
 
   // Observer callback to notice when our associated TabRestoreService
   // is destroyed.
   void TabRestoreServiceDestroyed(TabRestoreService* service) override;
 
-  // Overridden from AvatarMenuObserver:
-  void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override;
-
   // Cancel a pending jumplist update.
   void CancelPendingUpdate();
 
   // Terminate the jumplist: cancel any pending updates and stop observing
   // the Profile and its services. This must be called before the |profile_|
   // is destroyed.
   void Terminate();
 
   // Returns true if the custom JumpList is enabled.
   // The custom jumplist works only on Windows 7 and above.
@@ skipping 44 matching lines @@
 
   // Runnable method that updates the jumplist, once all the data
   // has been fetched.
   void RunUpdateOnFileThread(
       IncognitoModePrefs::Availability incognito_availability);
 
   // Helper method for RunUpdate to create icon files for the asynchrounously
   // 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;
 
   // Tracks FaviconService tasks.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // The Profile object is used to listen for events
   Profile* profile_;
 
   // Lives on the UI thread.
   scoped_ptr<content::NotificationRegistrar> registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
 
   // App id to associate with the jump list.
   std::wstring app_id_;
 
   // The directory which contains JumpList icons.
   base::FilePath icon_dir_;
 
   // Items in the "Most Visited" category of the application JumpList,
   // protected by the list_lock_.
   ShellLinkItemList most_visited_pages_;
 
   // Items in the "Recently Closed" category of the application JumpList,
   // 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;
   std::list<URLPair> icon_urls_;
 
   // Id of last favicon task. It's used to cancel current task if a new one
   // comes in before it finishes.
   base::CancelableTaskTracker::TaskId task_id_;
 
   // Lock for most_visited_pages_, recently_closed_pages_, icon_urls_
   // as they may be used by up to 3 threads.
   base::Lock list_lock_;
 
   // 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);
 };
 
 #endif  // CHROME_BROWSER_JUMPLIST_WIN_H_