chrome/chrome_browser_extensions.gypi - Issue 10381097: Move content settings extension API to content_settings dir.

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_extensions.gypi

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fixed conflict Created 8 years, 7 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

Index: chrome/chrome_browser_extensions.gypi

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

index 842e4d4bbb5cf0317af23bbbc7b5672693a3f34d..a9c8b5233207ab4d84eea51f29b880970a96fa48 100644

--- a/chrome/chrome_browser_extensions.gypi

+++ b/chrome/chrome_browser_extensions.gypi

@@ -72,6 +72,14 @@

'browser/extensions/api/bluetooth/bluetooth_api.h',

'browser/extensions/api/browsing_data/browsing_data_api.cc',

'browser/extensions/api/browsing_data/browsing_data_api.h',

+ 'browser/extensions/api/content_settings/content_settings_api.cc',

+ 'browser/extensions/api/content_settings/content_settings_api.h',

+ 'browser/extensions/api/content_settings/content_settings_api_constants.cc',

+ 'browser/extensions/api/content_settings/content_settings_api_constants.h',

+ 'browser/extensions/api/content_settings/content_settings_helpers.cc',

+ 'browser/extensions/api/content_settings/content_settings_helpers.h',

+ 'browser/extensions/api/content_settings/content_settings_store.cc',

+ 'browser/extensions/api/content_settings/content_settings_store.h',

'browser/extensions/api/commands/extension_command_service.cc',

'browser/extensions/api/commands/extension_command_service.h',

'browser/extensions/api/commands/extension_command_service_factory.cc',

@@ -218,12 +226,6 @@

'browser/extensions/extension_activity_log.h',

'browser/extensions/extension_browser_event_router.cc',

'browser/extensions/extension_browser_event_router.h',

- 'browser/extensions/extension_content_settings_api_constants.cc',

- 'browser/extensions/extension_content_settings_api_constants.h',

- 'browser/extensions/extension_content_settings_helpers.cc',

- 'browser/extensions/extension_content_settings_helpers.h',

- 'browser/extensions/extension_content_settings_store.cc',

- 'browser/extensions/extension_content_settings_store.h',

'browser/extensions/extension_context_menu_model.cc',

'browser/extensions/extension_context_menu_model.h',

'browser/extensions/extension_creator.cc',

@@ -485,8 +487,6 @@

'browser/extensions/execute_code_in_tab_function.h',

'browser/extensions/extension_chrome_auth_private_api.cc',

'browser/extensions/extension_chrome_auth_private_api.h',

- 'browser/extensions/extension_content_settings_api.cc',

- 'browser/extensions/extension_content_settings_api.h',

'browser/extensions/extension_debugger_api.cc',

'browser/extensions/extension_debugger_api.h',

'browser/extensions/extension_font_settings_api.cc',

« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »