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

Side by Side Diff: device/usb/mojo/device_manager_impl.h

Issue 2080083002: Revert of Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DEVICE_USB_MOJO_DEVICE_MANAGER_IMPL_H_ 5 #ifndef DEVICE_USB_MOJO_DEVICE_MANAGER_IMPL_H_
6 #define DEVICE_USB_MOJO_DEVICE_MANAGER_IMPL_H_ 6 #define DEVICE_USB_MOJO_DEVICE_MANAGER_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <queue> 9 #include <queue>
10 #include <set> 10 #include <set>
11 11
12 #include "base/callback.h"
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
15 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
16 #include "base/scoped_observer.h" 15 #include "base/scoped_observer.h"
17 #include "device/usb/public/interfaces/device_manager.mojom.h" 16 #include "device/usb/public/interfaces/device_manager.mojom.h"
18 #include "device/usb/usb_service.h" 17 #include "device/usb/usb_service.h"
19 #include "mojo/public/cpp/bindings/array.h" 18 #include "mojo/public/cpp/bindings/array.h"
20 #include "mojo/public/cpp/bindings/interface_request.h" 19 #include "mojo/public/cpp/bindings/interface_request.h"
21 #include "mojo/public/cpp/bindings/strong_binding.h" 20 #include "mojo/public/cpp/bindings/strong_binding.h"
22 21
(...skipping 16 matching lines...) Expand all
39 class DeviceManagerImpl : public DeviceManager, public UsbService::Observer { 38 class DeviceManagerImpl : public DeviceManager, public UsbService::Observer {
40 public: 39 public:
41 static void Create(base::WeakPtr<PermissionProvider> permission_provider, 40 static void Create(base::WeakPtr<PermissionProvider> permission_provider,
42 mojo::InterfaceRequest<DeviceManager> request); 41 mojo::InterfaceRequest<DeviceManager> request);
43 42
44 DeviceManagerImpl(base::WeakPtr<PermissionProvider> permission_provider, 43 DeviceManagerImpl(base::WeakPtr<PermissionProvider> permission_provider,
45 UsbService* usb_service, 44 UsbService* usb_service,
46 mojo::InterfaceRequest<DeviceManager> request); 45 mojo::InterfaceRequest<DeviceManager> request);
47 ~DeviceManagerImpl() override; 46 ~DeviceManagerImpl() override;
48 47
49 void set_connection_error_handler(const base::Closure& error_handler) { 48 void set_connection_error_handler(const mojo::Closure& error_handler) {
50 connection_error_handler_ = error_handler; 49 connection_error_handler_ = error_handler;
51 } 50 }
52 51
53 private: 52 private:
54 // DeviceManager implementation: 53 // DeviceManager implementation:
55 void GetDevices(EnumerationOptionsPtr options, 54 void GetDevices(EnumerationOptionsPtr options,
56 const GetDevicesCallback& callback) override; 55 const GetDevicesCallback& callback) override;
57 void GetDevice(const mojo::String& guid, 56 void GetDevice(const mojo::String& guid,
58 mojo::InterfaceRequest<Device> device_request) override; 57 mojo::InterfaceRequest<Device> device_request) override;
59 void SetClient(DeviceManagerClientPtr client) override; 58 void SetClient(DeviceManagerClientPtr client) override;
60 59
61 // Callbacks to handle the async responses from the underlying UsbService. 60 // Callbacks to handle the async responses from the underlying UsbService.
62 void OnGetDevices(EnumerationOptionsPtr options, 61 void OnGetDevices(EnumerationOptionsPtr options,
63 const GetDevicesCallback& callback, 62 const GetDevicesCallback& callback,
64 const std::vector<scoped_refptr<UsbDevice>>& devices); 63 const std::vector<scoped_refptr<UsbDevice>>& devices);
65 64
66 // UsbService::Observer implementation: 65 // UsbService::Observer implementation:
67 void OnDeviceAdded(scoped_refptr<UsbDevice> device) override; 66 void OnDeviceAdded(scoped_refptr<UsbDevice> device) override;
68 void OnDeviceRemoved(scoped_refptr<UsbDevice> device) override; 67 void OnDeviceRemoved(scoped_refptr<UsbDevice> device) override;
69 void WillDestroyUsbService() override; 68 void WillDestroyUsbService() override;
70 69
71 void MaybeRunDeviceChangesCallback(); 70 void MaybeRunDeviceChangesCallback();
72 71
73 base::WeakPtr<PermissionProvider> permission_provider_; 72 base::WeakPtr<PermissionProvider> permission_provider_;
74 73
75 UsbService* usb_service_; 74 UsbService* usb_service_;
76 ScopedObserver<UsbService, UsbService::Observer> observer_; 75 ScopedObserver<UsbService, UsbService::Observer> observer_;
77 DeviceManagerClientPtr client_; 76 DeviceManagerClientPtr client_;
78 77
79 base::Closure connection_error_handler_; 78 mojo::Closure connection_error_handler_;
80 79
81 mojo::StrongBinding<DeviceManager> binding_; 80 mojo::StrongBinding<DeviceManager> binding_;
82 base::WeakPtrFactory<DeviceManagerImpl> weak_factory_; 81 base::WeakPtrFactory<DeviceManagerImpl> weak_factory_;
83 82
84 DISALLOW_COPY_AND_ASSIGN(DeviceManagerImpl); 83 DISALLOW_COPY_AND_ASSIGN(DeviceManagerImpl);
85 }; 84 };
86 85
87 } // namespace usb 86 } // namespace usb
88 } // namespace device 87 } // namespace device
89 88
90 #endif // DEVICE_USB_MOJO_DEVICE_MANAGER_IMPL_H_ 89 #endif // DEVICE_USB_MOJO_DEVICE_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « device/usb/mojo/device_impl.cc ('k') | extensions/browser/api/mime_handler_private/mime_handler_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698