summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2014-12-03 00:44:32 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-03 08:45:42 +0000
commitfb2f68482dc71520565da63c4fa51bc209f482a9 (patch)
tree9ab05d180e09677cda5a9c517d62794aec384027
parent5cefae64650c1d313cdfef0ae9feb577e73ca8e1 (diff)
downloadchromium_src-fb2f68482dc71520565da63c4fa51bc209f482a9.zip
chromium_src-fb2f68482dc71520565da63c4fa51bc209f482a9.tar.gz
chromium_src-fb2f68482dc71520565da63c4fa51bc209f482a9.tar.bz2
Remove chromeos::PermissionBrokerClient::RequestUsbAccess.
As of https://crrev.com/43d512b568288fbbb7f401feb3d353b3d99e1570 this function is no longer used. The more specific access request function chromeos::PermissionBrokerClient::RequestPathAccess should be used instead. BUG= Review URL: https://codereview.chromium.org/778543002 Cr-Commit-Position: refs/heads/master@{#306575}
-rw-r--r--chromeos/dbus/fake_permission_broker_client.cc8
-rw-r--r--chromeos/dbus/fake_permission_broker_client.h5
-rw-r--r--chromeos/dbus/permission_broker_client.cc16
-rw-r--r--chromeos/dbus/permission_broker_client.h12
4 files changed, 1 insertions, 40 deletions
diff --git a/chromeos/dbus/fake_permission_broker_client.cc b/chromeos/dbus/fake_permission_broker_client.cc
index 2570fa3..defc010 100644
--- a/chromeos/dbus/fake_permission_broker_client.cc
+++ b/chromeos/dbus/fake_permission_broker_client.cc
@@ -21,12 +21,4 @@ void FakePermissionBrokerClient::RequestPathAccess(
callback.Run(false);
}
-void FakePermissionBrokerClient::RequestUsbAccess(
- const uint16_t vendor_id,
- const uint16_t product_id,
- int interface_id,
- const ResultCallback& callback) {
- callback.Run(false);
-}
-
} // namespace chromeos
diff --git a/chromeos/dbus/fake_permission_broker_client.h b/chromeos/dbus/fake_permission_broker_client.h
index dbfabe32..702a134 100644
--- a/chromeos/dbus/fake_permission_broker_client.h
+++ b/chromeos/dbus/fake_permission_broker_client.h
@@ -20,10 +20,7 @@ class FakePermissionBrokerClient : public PermissionBrokerClient {
virtual void RequestPathAccess(const std::string& path,
int interface_id,
const ResultCallback& callback) override;
- virtual void RequestUsbAccess(const uint16_t vendor_id,
- const uint16_t product_id,
- int interface_id,
- const ResultCallback& callback) override;
+
private:
DISALLOW_COPY_AND_ASSIGN(FakePermissionBrokerClient);
};
diff --git a/chromeos/dbus/permission_broker_client.cc b/chromeos/dbus/permission_broker_client.cc
index 7f4804e..6531057f 100644
--- a/chromeos/dbus/permission_broker_client.cc
+++ b/chromeos/dbus/permission_broker_client.cc
@@ -16,7 +16,6 @@ using permission_broker::kPermissionBrokerInterface;
using permission_broker::kPermissionBrokerServiceName;
using permission_broker::kPermissionBrokerServicePath;
using permission_broker::kRequestPathAccess;
-using permission_broker::kRequestUsbAccess;
namespace chromeos {
@@ -38,21 +37,6 @@ class PermissionBrokerClientImpl : public PermissionBrokerClient {
weak_ptr_factory_.GetWeakPtr(), callback));
}
- virtual void RequestUsbAccess(const uint16_t vendor_id,
- const uint16_t product_id,
- const int interface_id,
- const ResultCallback& callback) override {
- dbus::MethodCall method_call(kPermissionBrokerInterface, kRequestUsbAccess);
- dbus::MessageWriter writer(&method_call);
- writer.AppendUint16(vendor_id);
- writer.AppendUint16(product_id);
- writer.AppendInt32(interface_id);
- proxy_->CallMethod(&method_call,
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
- base::Bind(&PermissionBrokerClientImpl::OnResponse,
- weak_ptr_factory_.GetWeakPtr(), callback));
- }
-
protected:
virtual void Init(dbus::Bus* bus) override {
proxy_ =
diff --git a/chromeos/dbus/permission_broker_client.h b/chromeos/dbus/permission_broker_client.h
index 9ee953a..cf759fe 100644
--- a/chromeos/dbus/permission_broker_client.h
+++ b/chromeos/dbus/permission_broker_client.h
@@ -42,18 +42,6 @@ class CHROMEOS_EXPORT PermissionBrokerClient : public DBusClient {
int interface_id,
const ResultCallback& callback) = 0;
- // RequestUsbAccess attempts to request access to _all_ USB devices attached
- // to the system that match |vendor_id| and |product_id|. If |interface_id| is
- // passed (not -1), the request will check if a specific interface is claimed
- // while requesting access. This allows devices with multiple interfaces to be
- // accessed even if some of them are already claimed by kernel.
- // This call makes no attempt to guarantee atomicity, and partial failure is
- // indistinguishable from complete failure.
- virtual void RequestUsbAccess(uint16_t vendor_id,
- uint16_t product_id,
- int interface_id,
- const ResultCallback& callback) = 0;
-
protected:
PermissionBrokerClient();