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

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 520 matching lines @@
 JumpList::JumpList() : profile_(NULL) {
 }
 
 JumpList::~JumpList() {
   RemoveObserver();
 }
 
 // static
 bool JumpList::Enabled() {
   return (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7 &&
-          CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableCustomJumpList));
+          !CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kDisableCustomJumpList));
 }
 
 bool JumpList::AddObserver(Profile* profile) {
   // To update JumpList when a tab is added or removed, we add this object to
   // the observer list of the TabRestoreService class.
   // When we add this object to the observer list, we save the pointer to this
   // TabRestoreService object. This pointer is used when we remove this object
   // from the observer list.
   if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7 || !profile)
     return false;
@@ skipping 174 matching lines @@
                                            most_visited_pages_,
                                            recently_closed_pages_);
   MessageLoop* file_loop = g_browser_process->file_thread()->message_loop();
   if (file_loop)
     file_loop->PostTask(FROM_HERE, icon_task);
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }