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

Unified Diff: ash/wm/window_cycle_controller.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/wm/window_animations_unittest.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_cycle_controller.h
diff --git a/ash/wm/window_cycle_controller.h b/ash/wm/window_cycle_controller.h
index 888785e6ad4a980eeaf9cfb0972cad883ad38dae..05a19784e735f5602c388156e7fd19cd2c5e9343 100644
--- a/ash/wm/window_cycle_controller.h
+++ b/ash/wm/window_cycle_controller.h
@@ -5,9 +5,10 @@
#ifndef ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
#define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
namespace ui {
@@ -65,14 +66,14 @@ class ASH_EXPORT WindowCycleController {
// Cycles to the next or previous window based on |direction|.
void Step(Direction direction);
- scoped_ptr<WindowCycleList> window_cycle_list_;
+ std::unique_ptr<WindowCycleList> window_cycle_list_;
// Tracks what Window was active when starting to cycle and used to determine
// if the active Window changed in when ending cycling.
aura::Window* active_window_before_window_cycle_ = nullptr;
// Event handler to watch for release of alt key.
- scoped_ptr<ui::EventHandler> event_handler_;
+ std::unique_ptr<ui::EventHandler> event_handler_;
base::Time cycle_start_time_;
« no previous file with comments | « ash/wm/window_animations_unittest.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698