Merge 114806 - Include the information whether the tab is already in a tab strip with the retarge...

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2331 matching lines @@
         'browser/tab_contents/render_view_context_menu.cc',
         'browser/tab_contents/render_view_context_menu.h',
         'browser/tab_contents/render_view_context_menu_gtk.cc',
         'browser/tab_contents/render_view_context_menu_gtk.h',
         'browser/tab_contents/render_view_context_menu_mac.h',
         'browser/tab_contents/render_view_context_menu_mac.mm',
         'browser/tab_contents/render_view_context_menu_observer.cc',
         'browser/tab_contents/render_view_context_menu_observer.h',
         'browser/tab_contents/render_view_host_delegate_helper.cc',
         'browser/tab_contents/render_view_host_delegate_helper.h',
+        'browser/tab_contents/retargeting_details.h',
         'browser/tab_contents/tab_contents_ssl_helper.cc',
         'browser/tab_contents/tab_contents_ssl_helper.h',
         'browser/tab_contents/tab_contents_view_gtk.cc',
         'browser/tab_contents/tab_contents_view_gtk.h',
         'browser/tab_contents/tab_contents_view_mac.h',
         'browser/tab_contents/tab_contents_view_mac.mm',
         'browser/tab_contents/tab_contents_view_wrapper_gtk.h',
         'browser/tab_contents/tab_util.cc',
         'browser/tab_contents/tab_util.h',
         'browser/tab_contents/thumbnail_generator.cc',
@@ skipping 2885 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }