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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/focus_controller.h
diff --git a/components/mus/ws/focus_controller.h b/components/mus/ws/focus_controller.h
index 1dea308aa01f2a577da5454aacab87a08e8c6679..96a08609ad0c318c4695f5e6591c1d60eded15c4 100644
--- a/components/mus/ws/focus_controller.h
+++ b/components/mus/ws/focus_controller.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_
#define COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "components/mus/ws/server_window_drawn_tracker_observer.h"
#include "components/mus/ws/server_window_tracker.h"
@@ -86,12 +87,12 @@ class FocusController : public ServerWindowDrawnTrackerObserver {
// Keeps track of the list of windows that have already been visited during a
// window cycle. This is only active when |activation_reason_| is set to
// CYCLE.
- scoped_ptr<ServerWindowTracker> cycle_windows_;
+ std::unique_ptr<ServerWindowTracker> cycle_windows_;
base::ObserverList<FocusControllerObserver> observers_;
// Keeps track of the visibility of the focused and active window.
- scoped_ptr<ServerWindowDrawnTracker> drawn_tracker_;
+ std::unique_ptr<ServerWindowDrawnTracker> drawn_tracker_;
DISALLOW_COPY_AND_ASSIGN(FocusController);
};
« 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