chrome/chrome_browser.gypi - Issue 6854035: Move blocked content from TabContents to TabContentsWrapper.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser.gypi

Issue 6854035: Move blocked content from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/content_settings/content_settings_tab_helper_delegate.h ('K') | « chrome/browser/ui/views/location_bar/content_setting_image_view.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index c225e0981385d8fdc9abb89315831b90552a35ad..c7c4db30f0842922c3181994d969f3ebc6198677 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -261,8 +261,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',

@@ -2510,6 +2502,18 @@

'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/blocked_content_container.cc',

+ 'browser/ui/content_settings/blocked_content_container.h',

+ '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/content_settings/content_settings_tab_helper.cc',

+ 'browser/ui/content_settings/content_settings_tab_helper.h',

+ 'browser/ui/content_settings/content_settings_tab_helper_delegate.cc',

+ 'browser/ui/content_settings/content_settings_tab_helper_delegate.h',

'browser/ui/crypto_module_password_dialog.h',

'browser/ui/crypto_module_password_dialog_nss.cc',

'browser/ui/crypto_module_password_dialog_openssl.cc',