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

Side by Side Diff: ui/events/ozone/evdev/input_device_factory_evdev_proxy.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_ 5 #ifndef UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_
6 #define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_ 6 #define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_
7 7
8 #include <memory>
8 #include <set> 9 #include <set>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
18 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 18 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
19 19
20 namespace ui { 20 namespace ui {
21 21
22 enum class DomCode; 22 enum class DomCode;
23 class InputDeviceFactoryEvdev; 23 class InputDeviceFactoryEvdev;
24 struct InputDeviceSettingsEvdev; 24 struct InputDeviceSettingsEvdev;
25 25
26 typedef base::Callback<void(scoped_ptr<std::string>)> GetTouchDeviceStatusReply; 26 typedef base::Callback<void(std::unique_ptr<std::string>)>
27 typedef base::Callback<void(scoped_ptr<std::vector<base::FilePath>>)> 27 GetTouchDeviceStatusReply;
28 typedef base::Callback<void(std::unique_ptr<std::vector<base::FilePath>>)>
28 GetTouchEventLogReply; 29 GetTouchEventLogReply;
29 30
30 // Thread safe proxy for InputDeviceFactoryEvdev. 31 // Thread safe proxy for InputDeviceFactoryEvdev.
31 // 32 //
32 // This is used on the UI thread to proxy calls to the real object on 33 // This is used on the UI thread to proxy calls to the real object on
33 // the device I/O thread. 34 // the device I/O thread.
34 class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdevProxy { 35 class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdevProxy {
35 public: 36 public:
36 InputDeviceFactoryEvdevProxy( 37 InputDeviceFactoryEvdevProxy(
37 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 38 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
(...skipping 15 matching lines...) Expand all
53 private: 54 private:
54 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 55 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
55 base::WeakPtr<InputDeviceFactoryEvdev> input_device_factory_; 56 base::WeakPtr<InputDeviceFactoryEvdev> input_device_factory_;
56 57
57 DISALLOW_COPY_AND_ASSIGN(InputDeviceFactoryEvdevProxy); 58 DISALLOW_COPY_AND_ASSIGN(InputDeviceFactoryEvdevProxy);
58 }; 59 };
59 60
60 } // namespace ui 61 } // namespace ui
61 62
62 #endif // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_ 63 #endif // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/input_device_factory_evdev.cc ('k') | ui/events/ozone/evdev/input_device_factory_evdev_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698