summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/extensions/api/api_resource.h3
-rw-r--r--chrome/browser/extensions/api/api_resource_controller.cc7
-rw-r--r--chrome/browser/extensions/api/api_resource_controller.h2
-rw-r--r--chrome/browser/extensions/api/api_resource_event_notifier.cc48
-rw-r--r--chrome/browser/extensions/api/api_resource_event_notifier.h13
-rw-r--r--chrome/chrome_browser_extensions.gypi12
-rw-r--r--chrome/chrome_renderer.gypi10
-rw-r--r--chrome/common/extensions/api/_permission_features.json4
-rw-r--r--chrome/common/extensions/api/api.gyp8
-rw-r--r--chrome/common/extensions/extension_permission_set.cc3
-rw-r--r--chrome/common/extensions/extension_permission_set.h1
-rw-r--r--chrome/common/extensions/extension_permission_set_unittest.cc1
-rw-r--r--chrome/renderer/extensions/extension_dispatcher.cc6
-rw-r--r--chrome/renderer/renderer_resources.grd1
15 files changed, 18 insertions, 104 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f9674d7..a8b7452 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4305,9 +4305,6 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME
<message name="IDS_EXTENSION_PROMPT_WARNING_MANAGED_MODE" desc="Permission string for access to managed mode.">
Managed mode
</message>
- <message name="IDS_EXTENSION_PROMPT_WARNING_USB" desc="Permission string for access to USB devices.">
- Your USB peripherals
- </message>
<!-- Extension/App error messages -->
<message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found.">
diff --git a/chrome/browser/extensions/api/api_resource.h b/chrome/browser/extensions/api/api_resource.h
index 24f1afc..44a6d8e 100644
--- a/chrome/browser/extensions/api/api_resource.h
+++ b/chrome/browser/extensions/api/api_resource.h
@@ -23,8 +23,7 @@ class APIResource {
protected:
enum APIResourceType {
SocketResource,
- SerialConnectionResource,
- UsbDeviceResource,
+ SerialConnectionResource
};
APIResource(APIResourceType api_resource_type,
APIResourceEventNotifier* event_notifier);
diff --git a/chrome/browser/extensions/api/api_resource_controller.cc b/chrome/browser/extensions/api/api_resource_controller.cc
index 28d7e74..b101429 100644
--- a/chrome/browser/extensions/api/api_resource_controller.cc
+++ b/chrome/browser/extensions/api/api_resource_controller.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/api/api_resource_controller.h"
#include "chrome/browser/extensions/api/serial/serial_connection.h"
#include "chrome/browser/extensions/api/socket/socket.h"
-#include "chrome/browser/extensions/api/usb/usb_device_resource.h"
namespace extensions {
@@ -80,10 +79,4 @@ SerialConnection* APIResourceController::GetSerialConnection(
GetAPIResource(APIResource::SerialConnectionResource, api_resource_id));
}
-UsbDeviceResource* APIResourceController::GetUsbDeviceResource(
- int api_resource_id) const {
- return static_cast<UsbDeviceResource*>(GetAPIResource(
- APIResource::UsbDeviceResource, api_resource_id));
-}
-
} // namespace extensions
diff --git a/chrome/browser/extensions/api/api_resource_controller.h b/chrome/browser/extensions/api/api_resource_controller.h
index 1df2944..3e79182 100644
--- a/chrome/browser/extensions/api/api_resource_controller.h
+++ b/chrome/browser/extensions/api/api_resource_controller.h
@@ -16,7 +16,6 @@ namespace extensions {
class SerialConnection;
class Socket;
-class UsbDeviceResource;
// kSrcIdKey, or "srcId," binds an APIResource to the onEvent closure that was
// optionally passed to the APIResource's create() method. We generated it in
@@ -43,7 +42,6 @@ class APIResourceController {
// codebase.
Socket* GetSocket(int api_resource_id) const;
SerialConnection* GetSerialConnection(int api_resource_id) const;
- UsbDeviceResource* GetUsbDeviceResource(int api_resource_id) const;
private:
int next_api_resource_id_;
diff --git a/chrome/browser/extensions/api/api_resource_event_notifier.cc b/chrome/browser/extensions/api/api_resource_event_notifier.cc
index 6a15809..ef33c58 100644
--- a/chrome/browser/extensions/api/api_resource_event_notifier.cc
+++ b/chrome/browser/extensions/api/api_resource_event_notifier.cc
@@ -14,20 +14,18 @@
using content::BrowserThread;
namespace events {
-const char kExperimentalSocketOnEvent[] = "experimental.socket.onEvent";
-const char kExperimentalUsbOnEvent[] = "experimental.usb.onEvent";
+// TODO(miket): This should be generic, but at the moment only socket sends
+// onEvent events. We'll fix this when serial becomes nonblocking.
+const char kOnAPIResourceEvent[] = "experimental.socket.onEvent";
};
namespace extensions {
const char kEventTypeKey[] = "type";
-
const char kEventTypeConnectComplete[] = "connectComplete";
const char kEventTypeDataRead[] = "dataRead";
const char kEventTypeWriteComplete[] = "writeComplete";
-const char kEventTypeTransferComplete[] = "transferComplete";
-
const char kSrcIdKey[] = "srcId";
const char kIsFinalEventKey[] = "isFinalEvent";
@@ -50,8 +48,7 @@ APIResourceEventNotifier::APIResourceEventNotifier(
}
void APIResourceEventNotifier::OnConnectComplete(int result_code) {
- SendEventWithResultCode(events::kExperimentalSocketOnEvent,
- API_RESOURCE_EVENT_CONNECT_COMPLETE, result_code);
+ SendEventWithResultCode(API_RESOURCE_EVENT_CONNECT_COMPLETE, result_code);
}
void APIResourceEventNotifier::OnDataRead(int result_code,
@@ -73,26 +70,11 @@ void APIResourceEventNotifier::OnDataRead(int result_code,
event->Set(kDataKey, data);
event->SetString(kAddressKey, address);
event->SetInteger(kPortKey, port);
- DispatchEvent(events::kExperimentalSocketOnEvent, event);
+ DispatchEvent(event);
}
void APIResourceEventNotifier::OnWriteComplete(int result_code) {
- SendEventWithResultCode(events::kExperimentalSocketOnEvent,
- API_RESOURCE_EVENT_WRITE_COMPLETE, result_code);
-}
-
-void APIResourceEventNotifier::OnTransferComplete(int result_code,
- base::ListValue* data) {
- if (src_id_ < 0) {
- delete data;
- return;
- }
-
- DictionaryValue* event = CreateAPIResourceEvent(
- API_RESOURCE_EVENT_TRANSFER_COMPLETE);
- event->SetInteger(kResultCodeKey, result_code);
- event->Set(kDataKey, data);
- DispatchEvent(events::kExperimentalUsbOnEvent, event);
+ SendEventWithResultCode(API_RESOURCE_EVENT_WRITE_COMPLETE, result_code);
}
// static
@@ -105,8 +87,6 @@ std::string APIResourceEventNotifier::APIResourceEventTypeToString(
return kEventTypeDataRead;
case API_RESOURCE_EVENT_WRITE_COMPLETE:
return kEventTypeWriteComplete;
- case API_RESOURCE_EVENT_TRANSFER_COMPLETE:
- return kEventTypeTransferComplete;
}
NOTREACHED();
@@ -115,17 +95,15 @@ std::string APIResourceEventNotifier::APIResourceEventTypeToString(
APIResourceEventNotifier::~APIResourceEventNotifier() {}
-void APIResourceEventNotifier::DispatchEvent(const std::string &extension,
- DictionaryValue* event) {
+void APIResourceEventNotifier::DispatchEvent(DictionaryValue* event) {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(
- &APIResourceEventNotifier::DispatchEventOnUIThread, this, extension,
- event));
+ &APIResourceEventNotifier::DispatchEventOnUIThread, this, event));
}
void APIResourceEventNotifier::DispatchEventOnUIThread(
- const std::string &extension, DictionaryValue* event) {
+ DictionaryValue* event) {
ListValue args;
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -133,8 +111,9 @@ void APIResourceEventNotifier::DispatchEventOnUIThread(
args.Set(0, event);
std::string json_args;
base::JSONWriter::Write(&args, &json_args);
- router_->DispatchEventToExtension(src_extension_id_, extension, json_args,
- profile_, src_url_);
+ router_->DispatchEventToExtension(src_extension_id_,
+ events::kOnAPIResourceEvent,
+ json_args, profile_, src_url_);
}
DictionaryValue* APIResourceEventNotifier::CreateAPIResourceEvent(
@@ -153,7 +132,6 @@ DictionaryValue* APIResourceEventNotifier::CreateAPIResourceEvent(
}
void APIResourceEventNotifier::SendEventWithResultCode(
- const std::string &extension,
APIResourceEventType event_type,
int result_code) {
if (src_id_ < 0)
@@ -161,7 +139,7 @@ void APIResourceEventNotifier::SendEventWithResultCode(
DictionaryValue* event = CreateAPIResourceEvent(event_type);
event->SetInteger(kResultCodeKey, result_code);
- DispatchEvent(extension, event);
+ DispatchEvent(event);
}
} // namespace extensions
diff --git a/chrome/browser/extensions/api/api_resource_event_notifier.h b/chrome/browser/extensions/api/api_resource_event_notifier.h
index 09f4070..286a9c0 100644
--- a/chrome/browser/extensions/api/api_resource_event_notifier.h
+++ b/chrome/browser/extensions/api/api_resource_event_notifier.h
@@ -25,8 +25,7 @@ namespace extensions {
enum APIResourceEventType {
API_RESOURCE_EVENT_CONNECT_COMPLETE,
API_RESOURCE_EVENT_DATA_READ,
- API_RESOURCE_EVENT_WRITE_COMPLETE,
- API_RESOURCE_EVENT_TRANSFER_COMPLETE,
+ API_RESOURCE_EVENT_WRITE_COMPLETE
};
extern const char kSrcIdKey[];
@@ -60,8 +59,6 @@ class APIResourceEventNotifier
virtual void OnWriteComplete(int result_code);
- virtual void OnTransferComplete(int result_code, base::ListValue* data);
-
static std::string APIResourceEventTypeToString(
APIResourceEventType event_type);
@@ -71,13 +68,11 @@ class APIResourceEventNotifier
virtual ~APIResourceEventNotifier();
- void DispatchEvent(const std::string &extension, DictionaryValue* event);
- void DispatchEventOnUIThread(const std::string& extension,
- DictionaryValue* event);
+ void DispatchEvent(DictionaryValue* event);
+ void DispatchEventOnUIThread(DictionaryValue* event);
DictionaryValue* CreateAPIResourceEvent(APIResourceEventType event_type);
- void SendEventWithResultCode(const std::string& extension,
- APIResourceEventType event_type,
+ void SendEventWithResultCode(APIResourceEventType event_type,
int result_code);
ExtensionEventRouter* router_;
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 8b3b9c8..e968452 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -150,10 +150,6 @@
'browser/extensions/api/terminal/terminal_extension_helper.h',
'browser/extensions/api/terminal/terminal_private_api.cc',
'browser/extensions/api/terminal/terminal_private_api.h',
- 'browser/extensions/api/usb/usb_api.cc',
- 'browser/extensions/api/usb/usb_api.h',
- 'browser/extensions/api/usb/usb_device_resource.cc',
- 'browser/extensions/api/usb/usb_device_resource.h',
'browser/extensions/api/web_navigation/web_navigation_api.cc',
'browser/extensions/api/web_navigation/web_navigation_api.h',
'browser/extensions/api/web_navigation/web_navigation_api_constants.cc',
@@ -644,14 +640,6 @@
}],
],
}],
- ['OS=="android"', {
- 'sources!': [
- 'browser/extensions/api/usb/usb_api.cc',
- 'browser/extensions/api/usb/usb_api.h',
- 'browser/extensions/api/usb/usb_device_resource.cc',
- 'browser/extensions/api/usb/usb_device_resource.h',
- ],
- }],
],
},
],
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 06ff06e..cc41699 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -78,8 +78,6 @@
'renderer/extensions/event_bindings.h',
'renderer/extensions/experimental.socket_custom_bindings.cc',
'renderer/extensions/experimental.socket_custom_bindings.h',
- 'renderer/extensions/experimental.usb_custom_bindings.cc',
- 'renderer/extensions/experimental.usb_custom_bindings.h',
'renderer/extensions/extension_custom_bindings.cc',
'renderer/extensions/extension_custom_bindings.h',
'renderer/extensions/extension_dispatcher.cc',
@@ -147,7 +145,6 @@
'renderer/resources/extensions/experimental.offscreenTabs_custom_bindings.js',
'renderer/resources/extensions/experimental.runtime_custom_bindings.js',
'renderer/resources/extensions/experimental.socket_custom_bindings.js',
- 'renderer/resources/extensions/experimental.usb_custom_bindings.js',
'renderer/resources/extensions/experimental.webrequest_custom_bindings.js',
'renderer/resources/extensions/extension_custom_bindings.js',
'renderer/resources/extensions/file_browser_handler_custom_bindings.js',
@@ -302,13 +299,6 @@
}],
],
}],
- ['OS=="android"', {
- 'sources!': [
- 'renderer/extensions/experimental.usb_custom_bindings.cc',
- 'renderer/extensions/experimental.usb_custom_bindings.h',
- 'renderer/resources/extensions/experimental.usb_custom_bindings.js',
- ],
- }],
],
},
],
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 9df9c02..04dea29 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -220,10 +220,6 @@
"extension", "packaged_app", "hosted_app", "platform_app"
]
},
- "usb": {
- "channel": "stable",
- "extension_types": ["platform_app"]
- },
"webNavigation": {
"channel": "stable",
"extension_types": ["extension", "packaged_app"]
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 863bfd5..7646399 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -31,18 +31,10 @@
'experimental.dns.idl',
'experimental.serial.idl',
'experimental.socket.idl',
- 'experimental.usb.idl',
],
'cc_dir': 'chrome/common/extensions/api',
'root_namespace': 'extensions::api',
},
- 'conditions': [
- ['OS=="android"', {
- 'idl_schema_files!': [
- 'experimental.usb.idl',
- ],
- }],
- ],
},
],
}
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index b34a79a..1f51c72 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -262,9 +262,6 @@ void ExtensionAPIPermission::RegisterAllPermissions(
ExtensionPermissionMessage::kTtsEngine,
kFlagCannotBeOptional);
info->RegisterPermission(
- kUsb, "usb", IDS_EXTENSION_PROMPT_WARNING_USB,
- ExtensionPermissionMessage::kNone, kFlagNone);
- info->RegisterPermission(
kWebNavigation, "webNavigation",
IDS_EXTENSION_PROMPT_WARNING_TABS, ExtensionPermissionMessage::kTabs,
kFlagNone);
diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
index 75c4370..79e8742f 100644
--- a/chrome/common/extensions/extension_permission_set.h
+++ b/chrome/common/extensions/extension_permission_set.h
@@ -136,7 +136,6 @@ class ExtensionAPIPermission {
kTts,
kTtsEngine,
kUnlimitedStorage,
- kUsb,
kWebNavigation,
kWebRequest,
kWebRequestBlocking,
diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc
index 026858f..dfd5e85 100644
--- a/chrome/common/extensions/extension_permission_set_unittest.cc
+++ b/chrome/common/extensions/extension_permission_set_unittest.cc
@@ -614,7 +614,6 @@ TEST(ExtensionPermissionsTest, PermissionMessages) {
// Platform apps. TODO(miket): must we skip?
skip.insert(ExtensionAPIPermission::kSocket);
- skip.insert(ExtensionAPIPermission::kUsb);
ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance();
ExtensionAPIPermissionSet permissions = info->GetAll();
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 90e86b5..c808efa 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -24,7 +24,6 @@
#include "chrome/renderer/extensions/context_menus_custom_bindings.h"
#include "chrome/renderer/extensions/event_bindings.h"
#include "chrome/renderer/extensions/experimental.socket_custom_bindings.h"
-#include "chrome/renderer/extensions/experimental.usb_custom_bindings.h"
#include "chrome/renderer/extensions/extension_custom_bindings.h"
#include "chrome/renderer/extensions/extension_groups.h"
#include "chrome/renderer/extensions/extension_helper.h"
@@ -71,7 +70,6 @@ using content::RenderThread;
using extensions::ApiDefinitionsNatives;
using extensions::ContextMenusCustomBindings;
using extensions::ExperimentalSocketCustomBindings;
-using extensions::ExperimentalUsbCustomBindings;
using extensions::ExtensionAPI;
using extensions::ExtensionCustomBindings;
using extensions::Feature;
@@ -473,8 +471,6 @@ void ExtensionDispatcher::RegisterNativeHandlers(ModuleSystem* module_system,
new ExtensionCustomBindings(this)));
module_system->RegisterNativeHandler("experimental_socket",
scoped_ptr<NativeHandler>(new ExperimentalSocketCustomBindings()));
- module_system->RegisterNativeHandler("experimental_usb",
- scoped_ptr<NativeHandler>(new ExperimentalUsbCustomBindings()));
module_system->RegisterNativeHandler("file_browser_handler",
scoped_ptr<NativeHandler>(new FileBrowserHandlerCustomBindings()));
module_system->RegisterNativeHandler("file_browser_private",
@@ -526,8 +522,6 @@ void ExtensionDispatcher::PopulateSourceMap() {
IDR_EXPERIMENTAL_RUNTIME_CUSTOM_BINDINGS_JS);
source_map_.RegisterSource("experimental.socket",
IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS);
- source_map_.RegisterSource("experimental.usb",
- IDR_EXPERIMENTAL_USB_CUSTOM_BINDINGS_JS);
source_map_.RegisterSource("experimental.webRequest",
IDR_EXPERIMENTAL_WEBREQUEST_CUSTOM_BINDINGS_JS);
source_map_.RegisterSource("extension", IDR_EXTENSION_CUSTOM_BINDINGS_JS);
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index e7ba3c6..60eb28f5 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -41,7 +41,6 @@ without changes to the corresponding grd file. fb9 -->
<include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" />
<include name="IDR_EXPERIMENTAL_RUNTIME_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.runtime_custom_bindings.js" type="BINDATA" />
<include name="IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.socket_custom_bindings.js" type="BINDATA" />
- <include name="IDR_EXPERIMENTAL_USB_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.usb_custom_bindings.js" type="BINDATA" />
<include name="IDR_EXPERIMENTAL_WEBREQUEST_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.webrequest_custom_bindings.js" type="BINDATA" />
<include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="resources\extensions\extension_custom_bindings.js" type="BINDATA" />
<include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_handler_custom_bindings.js" type="BINDATA" />
generated by cgit v1.1 at 2025-03-16 14:31:23 +0000