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

Side by Side Diff: extensions/shell/browser/shell_device_client.h

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_
7 7
8 #include "device/core/device_client.h" 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "device/core/device_client.h"
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 // Implementation of device::DeviceClient that returns //device API service 16 // Implementation of device::DeviceClient that returns //device API service
17 // singletons appropriate for use within app shell. 17 // singletons appropriate for use within app shell.
18 class ShellDeviceClient : device::DeviceClient { 18 class ShellDeviceClient : device::DeviceClient {
19 public: 19 public:
20 ShellDeviceClient(); 20 ShellDeviceClient();
21 ~ShellDeviceClient() override; 21 ~ShellDeviceClient() override;
22 22
23 // device::DeviceClient implementation 23 // device::DeviceClient implementation
24 device::UsbService* GetUsbService() override; 24 device::UsbService* GetUsbService() override;
25 device::HidService* GetHidService() override; 25 device::HidService* GetHidService() override;
26 26
27 private: 27 private:
28 scoped_ptr<device::HidService> hid_service_; 28 std::unique_ptr<device::HidService> hid_service_;
29 scoped_ptr<device::UsbService> usb_service_; 29 std::unique_ptr<device::UsbService> usb_service_;
30 30
31 DISALLOW_COPY_AND_ASSIGN(ShellDeviceClient); 31 DISALLOW_COPY_AND_ASSIGN(ShellDeviceClient);
32 }; 32 };
33 33
34 } 34 }
35 35
36 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_ 36 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DEVICE_CLIENT_H_
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_mac.h ('k') | extensions/shell/browser/shell_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698