Move blocked content from TabContents to TabContentsWrapper.
BUG=71097
TEST=hammer on popup blocking; should be no visible change
Review URL: http://codereview.chromium.org/6854035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82643 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7464c11..97c1920 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -266,8 +266,6 @@
'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',
@@ -729,12 +727,6 @@
'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',
@@ -2092,6 +2084,12 @@
'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',
@@ -2532,6 +2530,12 @@
'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',
