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

Side by Side Diff: device/hid/input_service_linux.h

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 years, 1 month 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
« no previous file with comments | « device/hid/device_monitor_linux.h ('k') | gpu/command_buffer/service/common_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 DEVICE_HID_INPUT_SERVICE_LINUX_H_ 5 #ifndef DEVICE_HID_INPUT_SERVICE_LINUX_H_
6 #define DEVICE_HID_INPUT_SERVICE_LINUX_H_ 6 #define DEVICE_HID_INPUT_SERVICE_LINUX_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/containers/hash_tables.h" 13 #include "base/containers/hash_tables.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
16 #include "base/observer_list.h" 17 #include "base/observer_list.h"
17 #include "base/threading/thread_checker.h" 18 #include "base/threading/thread_checker.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 81
81 void AddDevice(const InputDeviceInfo& info); 82 void AddDevice(const InputDeviceInfo& info);
82 void RemoveDevice(const std::string& id); 83 void RemoveDevice(const std::string& id);
83 84
84 bool CalledOnValidThread() const; 85 bool CalledOnValidThread() const;
85 86
86 DeviceMap devices_; 87 DeviceMap devices_;
87 base::ObserverList<Observer> observers_; 88 base::ObserverList<Observer> observers_;
88 89
89 private: 90 private:
90 friend struct base::DefaultDeleter<InputServiceLinux>; 91 friend std::default_delete<InputServiceLinux>;
91 92
92 base::ThreadChecker thread_checker_; 93 base::ThreadChecker thread_checker_;
93 94
94 DISALLOW_COPY_AND_ASSIGN(InputServiceLinux); 95 DISALLOW_COPY_AND_ASSIGN(InputServiceLinux);
95 }; 96 };
96 97
97 } // namespace device 98 } // namespace device
98 99
99 #endif // DEVICE_HID_INPUT_SERVICE_LINUX_H_ 100 #endif // DEVICE_HID_INPUT_SERVICE_LINUX_H_
OLDNEW
« no previous file with comments | « device/hid/device_monitor_linux.h ('k') | gpu/command_buffer/service/common_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698