Merge 21522 - Integrates a custom JumpList of Windows 7 into Chromium....

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 23255)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -548,4 +548,7 @@
 // Enable session storage.  Still buggy.
 const wchar_t kEnableSessionStorage[] = L"enable-session-storage";
 
+// Enables the custom JumpList on Windows 7.
+const wchar_t kEnableCustomJumpList[] = L"enable-custom-jumplist";
+
 }  // namespace switches
Property changes on: chrome\common\chrome_switches.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/common/chrome_switches.cc:r21522