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

Side by Side Diff: components/mus/ws/focus_controller.h

Issue 1906623003: Convert //components/mus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_ 5 #ifndef COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_
6 #define COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_ 6 #define COMPONENTS_MUS_WS_FOCUS_CONTROLLER_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/observer_list.h" 11 #include "base/observer_list.h"
11 #include "components/mus/ws/server_window_drawn_tracker_observer.h" 12 #include "components/mus/ws/server_window_drawn_tracker_observer.h"
12 #include "components/mus/ws/server_window_tracker.h" 13 #include "components/mus/ws/server_window_tracker.h"
13 14
14 namespace mus { 15 namespace mus {
15 16
16 namespace ws { 17 namespace ws {
17 18
18 class FocusControllerDelegate; 19 class FocusControllerDelegate;
19 class FocusControllerObserver; 20 class FocusControllerObserver;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 80
80 ServerWindow* root_; 81 ServerWindow* root_;
81 ServerWindow* focused_window_; 82 ServerWindow* focused_window_;
82 ServerWindow* active_window_; 83 ServerWindow* active_window_;
83 // Tracks what caused |active_window_| to be activated. 84 // Tracks what caused |active_window_| to be activated.
84 ActivationChangeReason activation_reason_; 85 ActivationChangeReason activation_reason_;
85 86
86 // Keeps track of the list of windows that have already been visited during a 87 // Keeps track of the list of windows that have already been visited during a
87 // window cycle. This is only active when |activation_reason_| is set to 88 // window cycle. This is only active when |activation_reason_| is set to
88 // CYCLE. 89 // CYCLE.
89 scoped_ptr<ServerWindowTracker> cycle_windows_; 90 std::unique_ptr<ServerWindowTracker> cycle_windows_;
90 91
91 base::ObserverList<FocusControllerObserver> observers_; 92 base::ObserverList<FocusControllerObserver> observers_;
92 93
93 // Keeps track of the visibility of the focused and active window. 94 // Keeps track of the visibility of the focused and active window.
94 scoped_ptr<ServerWindowDrawnTracker> drawn_tracker_; 95 std::unique_ptr<ServerWindowDrawnTracker> drawn_tracker_;
95 96
96 DISALLOW_COPY_AND_ASSIGN(FocusController); 97 DISALLOW_COPY_AND_ASSIGN(FocusController);
97 }; 98 };
98 99
99 } // namespace ws 100 } // namespace ws
100 101
101 } // namespace mus 102 } // namespace mus
102 103
103 #endif // COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_ 104 #endif // COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_
OLDNEW
« no previous file with comments | « components/mus/ws/event_dispatcher_unittest.cc ('k') | components/mus/ws/focus_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698