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

Unified Diff: ash/wm/maximize_mode/maximize_mode_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/lock_window_state.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/maximize_mode_controller.h
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h
index 3042ce50bb3b02079e772c42d627bc551a6a0de8..32611bb84bf02fb13d76ae90ffb1c3af0cf47738 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.h
+++ b/ash/wm/maximize_mode/maximize_mode_controller.h
@@ -5,11 +5,12 @@
#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/shell_observer.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "ui/gfx/display.h"
#include "ui/gfx/geometry/vector3d_f.h"
@@ -112,7 +113,7 @@ class ASH_EXPORT MaximizeModeController :
// Set the TickClock. This is only to be used by tests that need to
// artificially and deterministically control the current time.
- void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);
+ void SetTickClockForTest(std::unique_ptr<base::TickClock> tick_clock);
#if defined(OS_CHROMEOS)
// Detect hinge rotation from base and lid accelerometers and automatically
@@ -144,11 +145,11 @@ class ASH_EXPORT MaximizeModeController :
TouchViewIntervalType CurrentTouchViewIntervalType();
// The maximized window manager (if enabled).
- scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
+ std::unique_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
// A helper class which when instantiated will block native events from the
// internal keyboard and touchpad.
- scoped_ptr<ScopedDisableInternalMouseAndKeyboard> event_blocker_;
+ std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> event_blocker_;
// Whether we have ever seen accelerometer data.
bool have_seen_accelerometer_data_;
@@ -167,7 +168,7 @@ class ASH_EXPORT MaximizeModeController :
base::TimeTicks last_lid_open_time_;
// Source for the current time in base::TimeTicks.
- scoped_ptr<base::TickClock> tick_clock_;
+ std::unique_ptr<base::TickClock> tick_clock_;
// Tracks when the lid is closed. Used to prevent entering maximize mode.
bool lid_is_closed_;
« no previous file with comments | « ash/wm/lock_window_state.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698