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

Side by Side Diff: ui/views/mouse_watcher.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
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | ui/views/mouse_watcher.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_MOUSE_WATCHER_H_ 5 #ifndef UI_VIEWS_MOUSE_WATCHER_H_
6 #define UI_VIEWS_MOUSE_WATCHER_H_ 6 #define UI_VIEWS_MOUSE_WATCHER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 11 #include "base/time/time.h"
11 #include "ui/gfx/geometry/insets.h" 12 #include "ui/gfx/geometry/insets.h"
12 #include "ui/views/views_export.h" 13 #include "ui/views/views_export.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class Point; 16 class Point;
16 } 17 }
17 18
18 namespace views { 19 namespace views {
19 20
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 private: 72 private:
72 class Observer; 73 class Observer;
73 74
74 // Are we currently observing events? 75 // Are we currently observing events?
75 bool is_observing() const { return observer_.get() != NULL; } 76 bool is_observing() const { return observer_.get() != NULL; }
76 77
77 // Notifies the listener and stops watching events. 78 // Notifies the listener and stops watching events.
78 void NotifyListener(); 79 void NotifyListener();
79 80
80 // Host we're listening for events over. 81 // Host we're listening for events over.
81 scoped_ptr<MouseWatcherHost> host_; 82 std::unique_ptr<MouseWatcherHost> host_;
82 83
83 // Our listener. 84 // Our listener.
84 MouseWatcherListener* listener_; 85 MouseWatcherListener* listener_;
85 86
86 // Does the actual work of listening for mouse events. 87 // Does the actual work of listening for mouse events.
87 scoped_ptr<Observer> observer_; 88 std::unique_ptr<Observer> observer_;
88 89
89 // See description above setter. 90 // See description above setter.
90 base::TimeDelta notify_on_exit_time_; 91 base::TimeDelta notify_on_exit_time_;
91 92
92 DISALLOW_COPY_AND_ASSIGN(MouseWatcher); 93 DISALLOW_COPY_AND_ASSIGN(MouseWatcher);
93 }; 94 };
94 95
95 } // namespace views 96 } // namespace views
96 97
97 #endif // UI_VIEWS_MOUSE_WATCHER_H_ 98 #endif // UI_VIEWS_MOUSE_WATCHER_H_
OLDNEW
« no previous file with comments | « ui/views/linux_ui/linux_ui.h ('k') | ui/views/mouse_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698