[Win] Add a fast profile switcher to the Windows taskbar item.

chrome/browser/jumplist_win.cc

 // 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.
 
 #include "chrome/browser/jumplist_win.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/jumplist_metrics.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
+#include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/history/core/browser/page_usage_data.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image_family.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
@@ skipping 77 matching lines @@
     items.push_back(incognito);
   }
 
   return jumplist_updater->AddTasks(items);
 }
 
 // Updates the application JumpList.
 bool UpdateJumpList(const wchar_t* app_id,
                     const ShellLinkItemList& most_visited_pages,
                     const ShellLinkItemList& recently_closed_pages,
+                    const ShellLinkItemList& profile_switcher,
                     IncognitoModePrefs::Availability incognito_availability) {
   // JumpList is implemented only on Windows 7 or later.
   // So, we should return now when this function is called on earlier versions
   // of Windows.
   if (!JumpListUpdater::IsEnabled())
     return true;
 
   JumpListUpdater jumplist_updater(app_id);
   if (!jumplist_updater.BeginUpdate())
     return false;
 
-  // We allocate 60% of the given JumpList slots to "most-visited" items
-  // and 40% to "recently-closed" items, respectively.
-  // Nevertheless, if there are not so many items in |recently_closed_pages|,
-  // we give the remaining slots to "most-visited" items.
-  const int kMostVisited = 60;
-  const int kRecentlyClosed = 40;
-  const int kTotal = kMostVisited + kRecentlyClosed;
-  size_t most_visited_items =
-      MulDiv(jumplist_updater.user_max_items(), kMostVisited, kTotal);
-  size_t recently_closed_items =
-      jumplist_updater.user_max_items() - most_visited_items;
-  if (recently_closed_pages.size() < recently_closed_items) {
-    most_visited_items += recently_closed_items - recently_closed_pages.size();
-    recently_closed_items = recently_closed_pages.size();
+  // Depending on the experiment, we are either showing the "Most-Visited" or
+  // "People" categories.
+  bool use_profiles_category = switches::HasProfilesJumplistExperiment();

[tapted, 2014/11/10 23:47:41]

This might hurt.. but I don't think it's safe to call
HasProfilesJumplistExperiment() here. it calls FieldTrialList which doesn't have
locking and a comment at the top of field_trial.h says "All code is called
exclusively on the UI thread currently."

[noms (inactive), 2014/11/12 19:04:11]

Done. Moved it to the constructor (it only needs to be checked once anyway).

+
+  size_t recently_closed_items;
+  size_t profiles_or_most_visited_items;
+
+  if (use_profiles_category) {
+    const size_t kMaxProfiles = 8;
+    // Show at most 8 profiles, and fill the rest of the slots with the
+    // "recently-closed" items.
+    profiles_or_most_visited_items = std::min(kMaxProfiles,
+                                              profile_switcher.size());
+    recently_closed_items =
+        jumplist_updater.user_max_items() - profiles_or_most_visited_items;

[tapted, 2014/11/10 23:47:41]

this could underflow if the user had set the limit to be smaller than the
default - something like `profiles_or_most_visited_item =
std::min(profiles_or_most_visited_item,  jumplist_updater.user_max_items());`
beforehand (or merging that into the initial assignment) should fix it

[noms (inactive), 2014/11/12 19:04:11]

Done.

+  } else {
+    // We allocate 60% of the given JumpList slots to "most-visited" items
+    // and 40% to "recently-closed" items, respectively.
+    // Nevertheless, if there are not so many items in |recently_closed_pages|,
+    // we give the remaining slots to "most-visited" items.
+    const int kMostVisited = 60;
+    const int kRecentlyClosed = 40;
+    const int kTotal = kMostVisited + kRecentlyClosed;
+    profiles_or_most_visited_items =
+        MulDiv(jumplist_updater.user_max_items(), kMostVisited, kTotal);
+    recently_closed_items =
+        jumplist_updater.user_max_items() - profiles_or_most_visited_items;
+    if (recently_closed_pages.size() < recently_closed_items) {
+      profiles_or_most_visited_items +=
+          recently_closed_items - recently_closed_pages.size();
+      recently_closed_items = recently_closed_pages.size();
+    }
   }
 
-  // Update the "Most Visited" category of the JumpList.
+  // Update the "Most Visited" category of the JumpList if it exists.
   // This update request is applied into the JumpList when we commit this
   // transaction.
-  if (!jumplist_updater.AddCustomCategory(
+  if (!use_profiles_category && !jumplist_updater.AddCustomCategory(
           base::UTF16ToWide(
               l10n_util::GetStringUTF16(IDS_NEW_TAB_MOST_VISITED)),
-          most_visited_pages, most_visited_items)) {
+          most_visited_pages, profiles_or_most_visited_items)) {
     return false;
   }
 
   // Update the "Recently Closed" category of the JumpList.
   if (!jumplist_updater.AddCustomCategory(
           base::UTF16ToWide(
               l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED)),
           recently_closed_pages, recently_closed_items)) {
     return false;
   }
 
+  // Update the "People" category of the JumpList if it exists. Only display it
+  // if there's more than one profile available.
+  if (use_profiles_category && profile_switcher.size() > 1 &&
+      !jumplist_updater.AddCustomCategory(
+          l10n_util::GetStringUTF16(IDS_PROFILES_OPTIONS_GROUP_NAME),
+          profile_switcher, profiles_or_most_visited_items)) {
+    return false;
+  }
+
   // Update the "Tasks" category of the JumpList.
   if (!UpdateTaskCategory(&jumplist_updater, incognito_availability))
     return false;
 
   // Commit this transaction and send the updated JumpList to Windows.
   if (!jumplist_updater.CommitUpdate())
     return false;
 
   return true;
 }
@@ skipping 32 matching lines @@
     // observers are detatched at that time.
     registrar_->Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                     content::Source<Profile>(profile_));
   }
   tab_restore_service->AddObserver(this);
   pref_change_registrar_.reset(new PrefChangeRegistrar);
   pref_change_registrar_->Init(profile_->GetPrefs());
   pref_change_registrar_->Add(
       prefs::kIncognitoModeAvailability,
       base::Bind(&JumpList::OnIncognitoAvailabilityChanged, this));
+
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  DCHECK(profile_manager);
+  avatar_menu_.reset(new AvatarMenu(
+      &profile_manager->GetProfileInfoCache(), this, NULL));
+  avatar_menu_->RebuildMenu();
+  UpdateProfileSwitcher();
 }
 
 JumpList::~JumpList() {
   Terminate();
 }
 
 // static
 bool JumpList::Enabled() {
   return JumpListUpdater::IsEnabled();
 }
@@ skipping 37 matching lines @@
     if (tab_restore_service)
       tab_restore_service->RemoveObserver(this);
     registrar_.reset();
     pref_change_registrar_.reset();
   }
   profile_ = NULL;
 }
 
 void JumpList::OnMostVisitedURLsAvailable(
     const history::MostVisitedURLList& data) {
-
   // If we have a pending favicon request, cancel it here (it is out of date).
   CancelPendingUpdate();
 
   {
     base::AutoLock auto_lock(list_lock_);
     most_visited_pages_.clear();
     for (size_t i = 0; i < data.size(); i++) {
       const history::MostVisitedURL& url = data[i];
       scoped_refptr<ShellLinkItem> link = CreateShellLink();
       std::string url_string = url.url.spec();
       std::wstring url_string_wide = base::UTF8ToWide(url_string);
       link->GetCommandLine()->AppendArgNative(url_string_wide);
+      link->GetCommandLine()->AppendSwitchASCII(
+          switches::kWinJumplistAction, JumplistMetrics::kMostVisitedCategory);
       link->set_title(!url.title.empty()? url.title : url_string_wide);
       most_visited_pages_.push_back(link);
       icon_urls_.push_back(make_pair(url_string, link));
     }
   }
 
   // Send a query that retrieves the first favicon.
   StartLoadingFavicon();
 }
 
@@ skipping 36 matching lines @@
     recently_closed_pages_ = temp_list;
   }
 
   // Send a query that retrieves the first favicon.
   StartLoadingFavicon();
 }
 
 void JumpList::TabRestoreServiceDestroyed(TabRestoreService* service) {
 }
 
+void JumpList::OnAvatarMenuChanged(AvatarMenu* avatar_menu) {
+  UpdateProfileSwitcher();
+  PostRunUpdate();
+}
+
 bool JumpList::AddTab(const TabRestoreService::Tab* tab,
                       ShellLinkItemList* list,
                       size_t max_items) {
   // This code adds the URL and the title strings of the given tab to the
   // specified list.
   if (list->size() >= max_items)
     return false;
 
   scoped_refptr<ShellLinkItem> link = CreateShellLink();
   const sessions::SerializedNavigationEntry& current_navigation =
       tab->navigations.at(tab->current_navigation_index);
   std::string url = current_navigation.virtual_url().spec();
   link->GetCommandLine()->AppendArgNative(base::UTF8ToWide(url));
+  link->GetCommandLine()->AppendSwitchASCII(
+      switches::kWinJumplistAction, JumplistMetrics::kRecentlyClosedCategory);
   link->set_title(current_navigation.title());
   list->push_back(link);
   icon_urls_.push_back(make_pair(url, link));
   return true;
 }
 
 void JumpList::AddWindow(const TabRestoreService::Window* window,
                          ShellLinkItemList* list,
                          size_t max_items) {
   // This code enumerates al the tabs in the given window object and add their
@@ skipping 14 matching lines @@
     waiting_for_icons = !icon_urls_.empty();
     if (waiting_for_icons) {
       // Ask FaviconService if it has a favicon of a URL.
       // When FaviconService has one, it will call OnFaviconDataAvailable().
       url = GURL(icon_urls_.front().first);
     }
   }
 
   if (!waiting_for_icons) {
     // No more favicons are needed by the application JumpList. Schedule a
-    // RunUpdate call.
+    // RunUpdateOnFileThread call.
     PostRunUpdate();
     return;
   }
 
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   task_id_ = favicon_service->GetFaviconImageForPageURL(
       url,
       base::Bind(&JumpList::OnFaviconDataAvailable, base::Unretained(this)),
       &cancelable_task_tracker_);
 }
 
 void JumpList::OnFaviconDataAvailable(
     const favicon_base::FaviconImageResult& image_result) {
   // If there is currently a favicon request in progress, it is now outdated,
   // as we have received another, so nullify the handle from the old request.
   task_id_ = base::CancelableTaskTracker::kBadTaskId;
-  // lock the list to set icon data and pop the url
+  // Lock the list to set icon data and pop the url.
   {
     base::AutoLock auto_lock(list_lock_);
     // Attach the received data to the ShellLinkItem object.
-    // This data will be decoded by the RunUpdate method.
+    // This data will be decoded by the RunUpdateOnFileThread method.
     if (!image_result.image.IsEmpty()) {
       if (!icon_urls_.empty() && icon_urls_.front().second)
         icon_urls_.front().second->set_icon_data(image_result.image.AsBitmap());
     }
 
     if (!icon_urls_.empty())
       icon_urls_.pop_front();
   }
   // Check whether we need to load more favicons.
   StartLoadingFavicon();
@@ skipping 12 matching lines @@
 }
 
 void JumpList::PostRunUpdate() {
   // Check if incognito windows (or normal windows) are disabled by policy.
   IncognitoModePrefs::Availability incognito_availability =
       profile_ ? IncognitoModePrefs::GetAvailability(profile_->GetPrefs())
                : IncognitoModePrefs::ENABLED;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(&JumpList::RunUpdate, this, incognito_availability));
+      base::Bind(&JumpList::RunUpdateOnFileThread,
+                 this,
+                 incognito_availability));
 }
 
-void JumpList::RunUpdate(
+void JumpList::RunUpdateOnFileThread(
     IncognitoModePrefs::Availability incognito_availability) {
   ShellLinkItemList local_most_visited_pages;
   ShellLinkItemList local_recently_closed_pages;
+  ShellLinkItemList local_profile_switcher;
 
   {
     base::AutoLock auto_lock(list_lock_);
     // Make sure we are not out of date: if icon_urls_ is not empty, then
     // another notification has been received since we processed this one
     if (!icon_urls_.empty())
       return;
 
     // Make local copies of lists so we can release the lock.
     local_most_visited_pages = most_visited_pages_;
     local_recently_closed_pages = recently_closed_pages_;
+    local_profile_switcher = profile_switcher_;
   }
 
   // Delete the directory which contains old icon files, rename the current
   // icon directory, and create a new directory which contains new JumpList
   // icon files.
   base::FilePath icon_dir_old(icon_dir_.value() + L"Old");
   if (base::PathExists(icon_dir_old))
     base::DeleteFile(icon_dir_old, true);
   base::Move(icon_dir_, icon_dir_old);
   base::CreateDirectory(icon_dir_);
 
   // Create temporary icon files for shortcuts in the "Most Visited" category.
   CreateIconFiles(local_most_visited_pages);
 
   // Create temporary icon files for shortcuts in the "Recently Closed"
   // category.
   CreateIconFiles(local_recently_closed_pages);
 
+  // Create temporary icon files for the profile avatars in the "People"
+  // category.
+  CreateIconFiles(local_profile_switcher);
+
   // We finished collecting all resources needed for updating an application
   // JumpList. So, create a new JumpList and replace the current JumpList
   // with it.
-  UpdateJumpList(app_id_.c_str(), local_most_visited_pages,
-                 local_recently_closed_pages, incognito_availability);
+  UpdateJumpList(app_id_.c_str(),
+                 local_most_visited_pages,
+                 local_recently_closed_pages,
+                 local_profile_switcher,
+                 incognito_availability);
 }
 
 void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) {
   for (ShellLinkItemList::const_iterator item = item_list.begin();
       item != item_list.end(); ++item) {
     base::FilePath icon_path;
     if (CreateIconFile((*item)->icon_data(), icon_dir_, &icon_path))
       (*item)->set_icon(icon_path.value(), 0);
   }
 }
+
+void JumpList::UpdateProfileSwitcher() {
+  ShellLinkItemList new_profile_switcher;
+
+  // Don't display a menu in the single profile case.
+  if (avatar_menu_->GetNumberOfItems() > 1) {
+    for (size_t i = 0; i < avatar_menu_->GetNumberOfItems(); ++i) {
+      scoped_refptr<ShellLinkItem> link = CreateShellLink();
+      const AvatarMenu::Item& item = avatar_menu_->GetItemAt(i);
+
+      link->set_title(item.name);
+      link->GetCommandLine()->AppendSwitchPath(
+          switches::kProfileDirectory, item.profile_path.BaseName());
+      link->GetCommandLine()->AppendSwitch(
+          switches::kActivateExistingProfileBrowser);
+      link->GetCommandLine()->AppendSwitchASCII(
+          switches::kWinJumplistAction, JumplistMetrics::kProfilesCategory);
+
+      gfx::Image avatar;
+      bool is_rectangle;
+      profiles::GetTransparentBackgroundProfileAvatar(
+          item.profile_path, &avatar, &is_rectangle);
+      link->set_icon_data(avatar.AsBitmap());
+      new_profile_switcher.push_back(link);
+    }
+  }
+
+  {
+    base::AutoLock auto_lock(list_lock_);
+    profile_switcher_.clear();

[tapted, 2014/11/10 23:47:41]

nit: this clear isn't needed (these will get freed when the function returns and
`new_profile_switcher` goes out of scope)

[noms (inactive), 2014/11/12 19:04:11]

Done.

+    new_profile_switcher.swap(profile_switcher_);
+  }
+}