aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Colish <colish@google.com>2015-12-09 15:54:56 -0800
committerDan Colish <colish@google.com>2015-12-09 15:57:20 -0800
commit52c1a153079a257662113810031d1a86929208d1 (patch)
tree8105f46eefa533f9db22bb4c30b7c90782c81d6c
parent53eea375ca0eac2b1c2ce041aeb58b3c8ec4070f (diff)
downloadwebservd-brillo-m8-dev.tar.gz
webservd: Update PermissionBrokerFirewall bus typesbrillo-m8-releasebrillo-m8-dev
This depends on the uprev of permission_broker to use the new dbus-binding-generator. BUG: 26092352 Change-Id: Ic5a29d2337bb05190053b1346152a856e5a7da7c
-rw-r--r--webservd/permission_broker_firewall.cc2
-rw-r--r--webservd/permission_broker_firewall.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/webservd/permission_broker_firewall.cc b/webservd/permission_broker_firewall.cc
index a0ac929..636e15c 100644
--- a/webservd/permission_broker_firewall.cc
+++ b/webservd/permission_broker_firewall.cc
@@ -58,7 +58,7 @@ void PermissionBrokerFirewall::PunchTcpHoleAsync(
}
void PermissionBrokerFirewall::OnPermissionBrokerOnline(
- org::chromium::PermissionBrokerProxy* proxy) {
+ org::chromium::PermissionBrokerProxyInterface* proxy) {
proxy_ = proxy;
service_online_cb_.Run();
}
diff --git a/webservd/permission_broker_firewall.h b/webservd/permission_broker_firewall.h
index bb8f8df..9721c04 100644
--- a/webservd/permission_broker_firewall.h
+++ b/webservd/permission_broker_firewall.h
@@ -40,13 +40,14 @@ class PermissionBrokerFirewall : public FirewallInterface {
const base::Callback<void(brillo::Error*)>& failure_cb) override;
private:
- void OnPermissionBrokerOnline(org::chromium::PermissionBrokerProxy* proxy);
+ void OnPermissionBrokerOnline(
+ org::chromium::PermissionBrokerProxyInterface* proxy);
std::unique_ptr<org::chromium::PermissionBroker::ObjectManagerProxy>
object_manager_;
// Proxy to the firewall DBus service. Owned by the DBus bindings module.
- org::chromium::PermissionBrokerProxy* proxy_;
+ org::chromium::PermissionBrokerProxyInterface* proxy_;
// Callback to use when firewall service comes online.
base::Closure service_online_cb_;