Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: chrome/chrome_browser_extensions.gypi

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Addressed comments 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser_extensions', 8 'target_name': 'browser_extensions',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 'browser/extensions/crx_installer.cc', 203 'browser/extensions/crx_installer.cc',
204 'browser/extensions/crx_installer.h', 204 'browser/extensions/crx_installer.h',
205 'browser/extensions/default_apps.cc', 205 'browser/extensions/default_apps.cc',
206 'browser/extensions/default_apps.h', 206 'browser/extensions/default_apps.h',
207 'browser/extensions/default_apps_trial.cc', 207 'browser/extensions/default_apps_trial.cc',
208 'browser/extensions/default_apps_trial.h', 208 'browser/extensions/default_apps_trial.h',
209 'browser/extensions/extension_activity_log.cc', 209 'browser/extensions/extension_activity_log.cc',
210 'browser/extensions/extension_activity_log.h', 210 'browser/extensions/extension_activity_log.h',
211 'browser/extensions/extension_browser_event_router.cc', 211 'browser/extensions/extension_browser_event_router.cc',
212 'browser/extensions/extension_browser_event_router.h', 212 'browser/extensions/extension_browser_event_router.h',
213 'browser/extensions/extension_command_service.cc',
214 'browser/extensions/extension_command_service.h',
215 'browser/extensions/extension_command_service_factory.cc',
216 'browser/extensions/extension_command_service_factory.h',
213 'browser/extensions/extension_content_settings_api_constants.cc', 217 'browser/extensions/extension_content_settings_api_constants.cc',
214 'browser/extensions/extension_content_settings_api_constants.h', 218 'browser/extensions/extension_content_settings_api_constants.h',
215 'browser/extensions/extension_content_settings_helpers.cc', 219 'browser/extensions/extension_content_settings_helpers.cc',
216 'browser/extensions/extension_content_settings_helpers.h', 220 'browser/extensions/extension_content_settings_helpers.h',
217 'browser/extensions/extension_content_settings_store.cc', 221 'browser/extensions/extension_content_settings_store.cc',
218 'browser/extensions/extension_content_settings_store.h', 222 'browser/extensions/extension_content_settings_store.h',
219 'browser/extensions/extension_context_menu_model.cc', 223 'browser/extensions/extension_context_menu_model.cc',
220 'browser/extensions/extension_context_menu_model.h', 224 'browser/extensions/extension_context_menu_model.h',
221 'browser/extensions/extension_cookies_api_constants.cc', 225 'browser/extensions/extension_cookies_api_constants.cc',
222 'browser/extensions/extension_cookies_api_constants.h', 226 'browser/extensions/extension_cookies_api_constants.h',
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 'browser/extensions/api/usb/usb_api.h', 654 'browser/extensions/api/usb/usb_api.h',
651 'browser/extensions/api/usb/usb_device_resource.cc', 655 'browser/extensions/api/usb/usb_device_resource.cc',
652 'browser/extensions/api/usb/usb_device_resource.h', 656 'browser/extensions/api/usb/usb_device_resource.h',
653 ], 657 ],
654 }], 658 }],
655 ], 659 ],
656 }, 660 },
657 ], 661 ],
658 } 662 }
659 663
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/page_action_image_view.cc ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698