Merge 22375 - Enable JumpList by default on Windows 7....

chrome/browser/jumplist.h

 // 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.
 
 #ifndef CHROME_BROWSER_JUMPLIST_H_
 #define CHROME_BROWSER_JUMPLIST_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 103 matching lines @@
   // OnSegmentUsageAvailable().
   virtual void TabRestoreServiceChanged(TabRestoreService* service);
 
   // Observer callback to notice when our associated TabRestoreService
   // is destroyed.
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service);
 
   // Returns true if the custom JumpList is enabled.
   // We use the custom JumpList when we satisfy the following conditions:
   // * Chromium is running on Windows 7 and;
-  // * Chromium is lauched with an "--enable-custom-jumplist" option.
+  // * Chromium is lauched without a "--disable-custom-jumplist" option.
   // TODO(hbono): to be enabled by default when we finalize the categories and
   // items of our JumpList.
   static bool Enabled();
 
  protected:
   // Creates a ShellLinkItem object from a tab (or a window) and add it to the
   // given list.
   // These functions are copied from the RecentlyClosedTabsHandler class for
   // compatibility with the new-tab page.
   bool AddTab(const TabRestoreService::Tab* tab,
@@ skipping 42 matching lines @@
 
   // Items in the "Recently Closed" category of the application JumpList.
   ShellLinkItemList recently_closed_pages_;
 
   // A list of URLs we need to retrieve their fav icons.
   typedef std::pair<std::string, scoped_refptr<ShellLinkItem> > URLPair;
   std::list<URLPair> icon_urls_;
 };
 
 #endif  // CHROME_BROWSER_JUMPLIST_H_