Move blocked content from TabContents to TabContentsWrapper.

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': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 246 matching lines @@
         'browser/background_mode_manager.cc',
         'browser/background_mode_manager.h',
         'browser/background_mode_manager_chromeos.cc',
         'browser/background_mode_manager_factory.cc',
         'browser/background_mode_manager_factory.h',
         'browser/background_mode_manager_linux.cc',
         'browser/background_mode_manager_mac.mm',
         'browser/background_mode_manager_win.cc',
         'browser/background_page_tracker.cc',
         'browser/background_page_tracker.h',
-        'browser/blocked_content_container.cc',
-        'browser/blocked_content_container.h',
         'browser/bookmarks/base_bookmark_model_observer.cc',
         'browser/bookmarks/base_bookmark_model_observer.h',
         'browser/bookmarks/bookmark_codec.cc',
         'browser/bookmarks/bookmark_codec.h',
         'browser/bookmarks/bookmark_context_menu_controller.cc',
         'browser/bookmarks/bookmark_context_menu_controller.h',
         'browser/bookmarks/bookmark_drop_info.cc',
         'browser/bookmarks/bookmark_drop_info.h',
         'browser/bookmarks/bookmark_editor.cc',
         'browser/bookmarks/bookmark_editor.h',
@@ skipping 449 matching lines @@
         'browser/cocoa/authorization_util.mm',
         'browser/cocoa/file_metadata.h',
         'browser/cocoa/file_metadata.mm',
         'browser/cocoa/install_from_dmg.h',
         'browser/cocoa/install_from_dmg.mm',
         'browser/cocoa/keystone_glue.h',
         'browser/cocoa/keystone_glue.mm',
         'browser/cocoa/scoped_authorizationref.h',
         'browser/command_updater.cc',
         'browser/command_updater.h',
-        'browser/content_setting_bubble_model.cc',
-        'browser/content_setting_bubble_model.h',
-        'browser/content_setting_combo_model.cc',
-        'browser/content_setting_combo_model.h',
-        'browser/content_setting_image_model.cc',
-        'browser/content_setting_image_model.h',
         'browser/content_settings/content_settings_base_provider.cc',
         'browser/content_settings/content_settings_base_provider.h',
         'browser/content_settings/content_settings_details.h',
         'browser/content_settings/content_settings_pattern.cc',
         'browser/content_settings/content_settings_pattern.h',
         'browser/content_settings/content_settings_provider.h',
         'browser/content_settings/host_content_settings_map.cc',
         'browser/content_settings/host_content_settings_map.h',
         'browser/content_settings/content_settings_notification_provider.cc',
         'browser/content_settings/content_settings_notification_provider.h',
@@ skipping 1335 matching lines @@
         'browser/transport_security_persister.h',
         'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog.h',
         'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc',
         'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h',
         'browser/ui/app_modal_dialogs/js_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/js_modal_dialog.h',
         'browser/ui/app_modal_dialogs/message_box_handler.cc',
         'browser/ui/app_modal_dialogs/message_box_handler.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
+        'browser/ui/blocked_content/blocked_content_container.cc',
+        'browser/ui/blocked_content/blocked_content_container.h',
+        'browser/ui/blocked_content/blocked_content_tab_helper.cc',
+        'browser/ui/blocked_content/blocked_content_tab_helper.h',
+        'browser/ui/blocked_content/blocked_content_tab_helper_delegate.cc',
+        'browser/ui/blocked_content/blocked_content_tab_helper_delegate.h',
         'browser/ui/browser.cc',
         'browser/ui/browser.h',
         'browser/ui/browser_dialogs.h',
         'browser/ui/browser_init.cc',
         'browser/ui/browser_init.h',
         'browser/ui/browser_list.cc',
         'browser/ui/browser_list.h',
         'browser/ui/browser_list_gtk.cc',
         'browser/ui/browser_list_mac.mm',
         'browser/ui/browser_list_stub.cc',
@@ skipping 420 matching lines @@
         'browser/ui/cocoa/wrench_menu/menu_tracked_button.h',
         'browser/ui/cocoa/wrench_menu/menu_tracked_button.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h',
         'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h',
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
         'browser/ui/collected_cookies_infobar_delegate.h',
         'browser/ui/collected_cookies_infobar_delegate.cc',
+        'browser/ui/content_settings/content_setting_bubble_model.cc',
+        'browser/ui/content_settings/content_setting_bubble_model.h',
+        'browser/ui/content_settings/content_setting_combo_model.cc',
+        'browser/ui/content_settings/content_setting_combo_model.h',
+        'browser/ui/content_settings/content_setting_image_model.cc',
+        'browser/ui/content_settings/content_setting_image_model.h',
         'browser/ui/crypto_module_password_dialog.h',
         'browser/ui/crypto_module_password_dialog_nss.cc',
         'browser/ui/crypto_module_password_dialog_openssl.cc',
         'browser/ui/download/download_tab_helper.cc',
         'browser/ui/download/download_tab_helper.h',
         'browser/ui/find_bar/find_bar.h',
         'browser/ui/find_bar/find_bar_controller.cc',
         'browser/ui/find_bar/find_bar_controller.h',
         'browser/ui/find_bar/find_bar_state.cc',
         'browser/ui/find_bar/find_bar_state.h',
@@ skipping 1913 matching lines @@
       'hard_dependency': 1,
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: