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

Side by Side Diff: ui/events/platform/x11/x11_event_source_glib.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_PLATFORM_X11_X11_EVENT_SOURCE_GLIB_H_ 5 #ifndef UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_GLIB_H_
6 #define UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_GLIB_H_ 6 #define UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_GLIB_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "ui/events/events_export.h" 13 #include "ui/events/events_export.h"
13 #include "ui/events/platform/platform_event_source.h" 14 #include "ui/events/platform/platform_event_source.h"
14 #include "ui/events/platform/x11/x11_event_source.h" 15 #include "ui/events/platform/x11/x11_event_source.h"
15 #include "ui/gfx/x/x11_types.h" 16 #include "ui/gfx/x/x11_types.h"
16 17
17 typedef struct _GPollFD GPollFD; 18 typedef struct _GPollFD GPollFD;
18 typedef struct _GSource GSource; 19 typedef struct _GSource GSource;
19 20
20 namespace ui { 21 namespace ui {
21 22
(...skipping 14 matching lines...) Expand all
36 void OnDispatcherListChanged() override; 37 void OnDispatcherListChanged() override;
37 38
38 void InitXSource(int fd); 39 void InitXSource(int fd);
39 40
40 X11EventSource event_source_; 41 X11EventSource event_source_;
41 42
42 // The GLib event source for X events. 43 // The GLib event source for X events.
43 GSource* x_source_ = nullptr; 44 GSource* x_source_ = nullptr;
44 45
45 // The poll attached to |x_source_|. 46 // The poll attached to |x_source_|.
46 scoped_ptr<GPollFD> x_poll_; 47 std::unique_ptr<GPollFD> x_poll_;
47 48
48 DISALLOW_COPY_AND_ASSIGN(X11EventSourceGlib); 49 DISALLOW_COPY_AND_ASSIGN(X11EventSourceGlib);
49 }; 50 };
50 51
51 } // namespace ui 52 } // namespace ui
52 53
53 #endif // UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_GLIB_H_ 54 #endif // UI_EVENTS_PLATFORM_X11_X11_EVENT_SOURCE_GLIB_H_
OLDNEW
« no previous file with comments | « ui/events/platform/x11/x11_event_source.h ('k') | ui/events/platform/x11/x11_event_source_glib.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698