Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1543)

Unified Diff: device/devices_app/devices_app.cc

Issue 1226163009: Convert usages of mojo::ErrorHandler in //device to callbacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/devices_app/devices_app.cc
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc
index 0aab6cb1d9f785f3155b2a64735e602e7544e9d0..1f49170e8991523152136a30894a930231f03574 100644
--- a/device/devices_app/devices_app.cc
+++ b/device/devices_app/devices_app.cc
@@ -17,7 +17,6 @@
#include "device/usb/usb_service.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
#include "url/gurl.h"
@@ -136,7 +135,8 @@ void DevicesApp::Create(mojo::ApplicationConnection* connection,
// Owned by its message pipe.
usb::DeviceManagerImpl* device_manager = new usb::DeviceManagerImpl(
request.Pass(), delegate.Pass(), service_task_runner_);
- device_manager->set_error_handler(this);
+ device_manager->set_connection_error_handler(
+ base::Bind(&DevicesApp::OnConnectionError, base::Unretained(this)));
active_device_manager_count_++;
idle_timeout_callback_.Cancel();

Powered by Google App Engine
This is Rietveld 408576698