diff options
| -rw-r--r-- | chrome/browser/DEPS | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 7 | ||||
| -rw-r--r-- | chrome/common/extensions/permissions/usb_device_permission.cc | 10 |
5 files changed, 19 insertions, 7 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 40d1eb5..219cd51 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -6,7 +6,7 @@ include_rules = [ "+chromeos", "+content/components", "+content/public/browser", - "+device", + "+device/bluetooth", "+extensions/common", "+google/cacheinvalidation", # Sync invalidation API protobuf files. "+google_apis", diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index de5f82d5..6e64266 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -31,7 +31,6 @@ '../content/content.gyp:content_browser', '../crypto/crypto.gyp:crypto', '../device/device.gyp:device_bluetooth', - '../device/device.gyp:device_usb', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../sync/sync.gyp:sync_notifier', @@ -768,8 +767,6 @@ ['include', '^browser/extensions/api/messaging/native_process_launcher_win.cc'], ['include', '^browser/extensions/api/messaging/native_message_port.cc'], ['include', '^browser/extensions/api/omnibox/omnibox_api.cc'], - ['include', '^browser/extensions/api/permissions/permissions_api.cc'], - ['include', '^browser/extensions/api/permissions/permissions_api_helpers.cc'], ['include', '^browser/extensions/api/processes/processes_api.cc'], ['include', '^browser/extensions/api/processes/processes_api_constants.cc'], ['include', '^browser/extensions/api/proxy/proxy_api.cc'], @@ -792,6 +789,7 @@ ['include', '^browser/extensions/api/web_request/web_request_time_tracker.cc'], ], 'dependencies!': [ + '../device/device.gyp:device_bluetooth', '../third_party/libusb/libusb.gyp:libusb' ], }], diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 82cac0c..91f6e80 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -438,6 +438,9 @@ 'sources!': [ 'common/extensions/api/extension_api_stub.cc', ], + 'dependencies': [ + '../device/device.gyp:device_usb', + ], }, { # enable_extensions == 0 'sources/': [ ['exclude', '^common/extensions/api/'], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 96c7196..6a85eac 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1738,6 +1738,11 @@ ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'], ['exclude', '^common/extensions/api/'], ], + 'sources!':[ + 'browser/extensions/extension_context_menu_model_unittest.cc', + 'browser/extensions/extension_ui_unittest.cc', + 'browser/extensions/permissions_updater_unittest.cc', + ], }], ['use_ash==1', { 'sources': [ @@ -2092,8 +2097,6 @@ # There's no Browser/BrowserList on Android. 'browser/browser_commands_unittest.cc', - 'browser/extensions/extension_context_menu_model_unittest.cc', - 'browser/extensions/extension_ui_unittest.cc', 'browser/managed_mode/managed_mode_unittest.cc', 'browser/managed_mode/managed_mode_url_filter_unittest.cc', 'browser/net/gaia/gaia_oauth_fetcher_unittest.cc', diff --git a/chrome/common/extensions/permissions/usb_device_permission.cc b/chrome/common/extensions/permissions/usb_device_permission.cc index cc13b93..7396175 100644 --- a/chrome/common/extensions/permissions/usb_device_permission.cc +++ b/chrome/common/extensions/permissions/usb_device_permission.cc @@ -11,10 +11,13 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/common/extensions/permissions/permissions_info.h" -#include "device/usb/usb_ids.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#if defined(ENABLE_EXTENSIONS) +#include "device/usb/usb_ids.h" +#endif + namespace extensions { UsbDevicePermission::UsbDevicePermission( @@ -30,6 +33,8 @@ PermissionMessages UsbDevicePermission::GetMessages() const { DCHECK(HasMessages()); PermissionMessages result; +#if defined(ENABLE_EXTENSIONS) + // device.gyp:device_usb is not available when extensions are disabled. for (std::set<UsbDevicePermissionData>::const_iterator i = data_set_.begin(); i != data_set_.end(); ++i) { @@ -59,6 +64,9 @@ PermissionMessages UsbDevicePermission::GetMessages() const { product_name, vendor_name))); } +#else + NOTREACHED(); +#endif // defined(ENABLE_EXTENSIONS) return result; } |