A fix for Issue 18994....

chrome/browser/jumplist.cc

 // Copyright (c) 2006-2009 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.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 16 matching lines @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
+#include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // COM interfaces used in this file.
 // These interface declarations are copied from Windows SDK 7.0.
 // TODO(hbono): Bug 16903: to be deleted them when we use Windows SDK 7.0.
 #ifndef __IObjectArray_INTERFACE_DEFINED__
 #define __IObjectArray_INTERFACE_DEFINED__
 
@@ skipping 226 matching lines @@
 // * switches (std::wstring)
 //   Command-lien switches for the application. This string is to be added
 //   before the arguments of each ShellLinkItem object. If there aren't any
 //   switches, use an empty string.
 // * data (ShellLinkItemList)
 //   A list of ShellLinkItem objects to be added under the specified category.
 HRESULT UpdateCategory(ScopedComPtr<ICustomDestinationList> list,
                        int category_id,
                        const std::wstring& application,
                        const std::wstring& switches,
-                       const ShellLinkItemList& data) {
+                       const ShellLinkItemList& data,
+                       int max_slots) {
   // Exit this function when the given vector does not contain any items
   // because an ICustomDestinationList::AppendCategory() call fails in this
   // case.
-  if (data.empty())
+  if (data.empty() || !max_slots)
     return S_OK;
 
   std::wstring category = l10n_util::GetString(category_id);
 
   // Create an EnumerableObjectCollection object.
   // We once add the given items to this collection object and add this
   // collection to the JumpList.
   ScopedComPtr<IObjectCollection> collection;
   HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
                                              NULL, CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
   for (ShellLinkItemList::const_iterator item = data.begin();
-       item != data.end(); ++item) {
+       item != data.end() && max_slots > 0; ++item, --max_slots) {
     scoped_refptr<ShellLinkItem> link(*item);
     AddShellLink(collection, application, switches, link);
   }
 
   // We can now add the new list to the JumpList.
   // The ICustomDestinationList::AppendCategory() function needs the
   // IObjectArray interface to retrieve each item in the list. So, we retrive
   // the IObjectArray interface from the IEnumeratableObjectCollection object
   // and use it.
   // It seems the ICustomDestinationList::AppendCategory() function just
@@ skipping 73 matching lines @@
   if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
     return true;
 
   // Create an ICustomDestinationList object and attach it to our application.
   ScopedComPtr<ICustomDestinationList> destination_list;
   HRESULT result = destination_list.CreateInstance(CLSID_DestinationList, NULL,
                                                    CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
+  // Set the App ID for this JumpList.
+  destination_list->SetAppID(l10n_util::GetString(IDS_PRODUCT_NAME).c_str());
+
   // Start a transaction that updates the JumpList of this application.
   // This implementation just replaces the all items in this JumpList, so
   // we don't have to use the IObjectArray object returned from this call.
   // It seems Windows 7 RC (Build 7100) automatically checks the items in this
   // removed list and prevent us from adding the same item.
   UINT max_slots;
   ScopedComPtr<IObjectArray> removed;
   result = destination_list->BeginList(&max_slots, __uuidof(*removed),
                                        reinterpret_cast<void**>(&removed));
   if (FAILED(result))
     return false;
 
   // Retrieve the absolute path to "chrome.exe".
   std::wstring chrome_path;
   if (!PathService::Get(base::FILE_EXE, &chrome_path))
     return false;
 
   // Retrieve the command-line switches of this process.
   std::wstring chrome_switches;
 
+  // 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(max_slots, kMostVisited, kTotal);
+  size_t recently_closed_items = max_slots - 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();
+  }
+
   // Update the "Most Visited" category of the JumpList.
   // This update request is applied into the JumpList when we commit this
   // transaction.
   result = UpdateCategory(destination_list, IDS_NEW_TAB_MOST_VISITED,
-                          chrome_path, chrome_switches, most_visited_pages);
+                          chrome_path, chrome_switches, most_visited_pages,
+                          most_visited_items);
   if (FAILED(result))
     return false;
 
   // Update the "Recently Closed" category of the JumpList.
   result = UpdateCategory(destination_list, IDS_NEW_TAB_RECENTLY_CLOSED,
-                          chrome_path, chrome_switches, recently_closed_pages);
+                          chrome_path, chrome_switches, recently_closed_pages,
+                          recently_closed_items);
   if (FAILED(result))
     return false;
 
   // Update the "Tasks" category of the JumpList.
   result = UpdateTaskCategory(destination_list, chrome_path, chrome_switches);
   if (FAILED(result))
     return false;
 
   // Commit this transaction and send the updated JumpList to Windows.
   result = destination_list->CommitList();
@@ skipping 246 matching lines @@
   // As noted above, we create a ShellLinkItem objects with the following
   // parameters.
   // * arguments
   //   The last URL of the tab object.
   // * title
   //   The title of the last URL.
   // * icon
   //   An empty string. This value is to be updated in OnFavIconDataAvailable().
   // This code is copied from
   // RecentlyClosedTabsHandler::TabRestoreServiceChanged() to emulate it.
+  const int kRecentlyClosedCount = 4;
   recently_closed_pages_.clear();
   TabRestoreService* tab_restore_service = profile_->GetTabRestoreService();
   const TabRestoreService::Entries& entries = tab_restore_service->entries();
   for (TabRestoreService::Entries::const_iterator it = entries.begin();
        it != entries.end(); ++it) {
     const TabRestoreService::Entry* entry = *it;
     if (entry->type == TabRestoreService::TAB) {
       AddTab(static_cast<const TabRestoreService::Tab*>(entry),
-             &recently_closed_pages_, 3);
+             &recently_closed_pages_, kRecentlyClosedCount);
     } else if (entry->type == TabRestoreService::WINDOW) {
       AddWindow(static_cast<const TabRestoreService::Window*>(entry),
-                &recently_closed_pages_, 3);
+                &recently_closed_pages_, kRecentlyClosedCount);
     }
   }
 
   // Send a query that retrieves the first fav icon.
   StartLoadingFavIcon();
 }
 
 void JumpList::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     bool know_favicon,
@@ skipping 18 matching lines @@
   // the file thread.
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
       new JumpListUpdateTask(
           icon_dir_, most_visited_pages_, recently_closed_pages_));
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }