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

chrome/chrome.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 1205 matching lines @@
         'browser/in_process_webkit/dom_storage_dispatcher_host.h',
         'browser/in_process_webkit/webkit_context.cc',
         'browser/in_process_webkit/webkit_context.h',
         'browser/in_process_webkit/webkit_thread.cc',
         'browser/in_process_webkit/webkit_thread.h',
         'browser/input_window_dialog.h',
         'browser/input_window_dialog_gtk.cc',
         'browser/input_window_dialog_win.cc',
         'browser/jankometer.cc',
         'browser/jankometer.h',
+        'browser/jumplist.cc',
+        'browser/jumplist.h',
         'browser/jsmessage_box_handler.cc',
         'browser/jsmessage_box_handler.h',
         'browser/keychain_mac.cc',
         'browser/keychain_mac.h',
         'browser/load_from_memory_cache_details.h',
         'browser/load_notification_details.h',
         'browser/location_bar.h',
         'browser/login_prompt.cc',
         'browser/login_prompt.h',
         'browser/login_prompt_gtk.cc',
@@ skipping 1008 matching lines @@
             'browser/extensions/extension_creator.cc',
             'browser/dom_ui/html_dialog_contents.cc',
             'browser/encoding_menu_controller_delegate.cc',
             'browser/external_tab_container.cc',
             'browser/google_update.cc',
             'browser/history/history_indexer.idl',
             'browser/history_tab_ui.cc',
             'browser/history_view.cc',
             'browser/ime_input.cc',
             'browser/importer/ie_importer.cc',
+            'browser/jumplist.cc',
             'browser/memory_details.cc',
             'browser/modal_html_dialog_delegate.cc',
             'browser/sandbox_policy.cc',
             'browser/shell_integration.cc',
             'browser/tab_contents/web_drag_source.cc',
             'browser/tab_contents/web_drop_target.cc',
           ],
         }],
       ],
     },
@@ skipping 2801 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }