diff options
| author | ben <ben@chromium.org> | 2016-02-05 16:23:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-06 00:24:33 +0000 |
| commit | 48e3499642469f5f468a16c0967f4bcf5e10fe79 (patch) | |
| tree | 523d80c6536ffabd1480def3a98d85e8501d8893 /device | |
| parent | 6bca21e40d0273798d751b41e0abe9a03928ee3d (diff) | |
| download | chromium_src-48e3499642469f5f468a16c0967f4bcf5e10fe79.zip chromium_src-48e3499642469f5f468a16c0967f4bcf5e10fe79.tar.gz chromium_src-48e3499642469f5f468a16c0967f4bcf5e10fe79.tar.bz2 | |
ConfigureIncomingConnection -> AcceptConnection
Makes this interface begin to resemble Application a bit more closely.
R=rockot@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1674803002
Cr-Commit-Position: refs/heads/master@{#373963}
Diffstat (limited to 'device')
| -rw-r--r-- | device/devices_app/devices_app.cc | 3 | ||||
| -rw-r--r-- | device/devices_app/devices_app.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc index 0279629..eb5c01c 100644 --- a/device/devices_app/devices_app.cc +++ b/device/devices_app/devices_app.cc @@ -87,8 +87,7 @@ void DevicesApp::Initialize(mojo::ApplicationImpl* app) { StartIdleTimer(); } -bool DevicesApp::ConfigureIncomingConnection( - mojo::ApplicationConnection* connection) { +bool DevicesApp::AcceptConnection(mojo::ApplicationConnection* connection) { connection->AddService<usb::DeviceManager>(this); return true; } diff --git a/device/devices_app/devices_app.h b/device/devices_app/devices_app.h index 3c6a838..fb714f8 100644 --- a/device/devices_app/devices_app.h +++ b/device/devices_app/devices_app.h @@ -35,8 +35,7 @@ class DevicesApp : public mojo::ApplicationDelegate, // mojo::ApplicationDelegate: void Initialize(mojo::ApplicationImpl* app) override; - bool ConfigureIncomingConnection( - mojo::ApplicationConnection* connection) override; + bool AcceptConnection(mojo::ApplicationConnection* connection) override; void Quit() override; // mojo::InterfaceFactory<usb::DeviceManager>: |