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

Unified Diff: ash/touch/touch_hud_debug.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/tooltips/tooltip_controller_unittest.cc ('k') | ash/touch/touch_hud_debug.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_hud_debug.h
diff --git a/ash/touch/touch_hud_debug.h b/ash/touch/touch_hud_debug.h
index 25fa41431a8f6cae33360e0379b32ef257296614..5079588464bde6163c0a921f0501e881081bb404 100644
--- a/ash/touch/touch_hud_debug.h
+++ b/ash/touch/touch_hud_debug.h
@@ -8,11 +8,11 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include "ash/ash_export.h"
#include "ash/touch/touch_observer_hud.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
namespace views {
@@ -39,7 +39,7 @@ class ASH_EXPORT TouchHudDebug : public TouchObserverHUD {
// Returns the log of touch events for all displays as a dictionary mapping id
// of each display to its touch log.
- static scoped_ptr<base::DictionaryValue> GetAllAsDictionary();
+ static std::unique_ptr<base::DictionaryValue> GetAllAsDictionary();
// Changes the display mode (e.g. scale, visibility). Calling this repeatedly
// cycles between a fixed number of display modes.
@@ -47,7 +47,7 @@ class ASH_EXPORT TouchHudDebug : public TouchObserverHUD {
// Returns log of touch events as a list value. Each item in the list is a
// trace of one touch point.
- scoped_ptr<base::ListValue> GetLogAsList() const;
+ std::unique_ptr<base::ListValue> GetLogAsList() const;
Mode mode() const { return mode_; }
@@ -73,7 +73,7 @@ class ASH_EXPORT TouchHudDebug : public TouchObserverHUD {
Mode mode_;
- scoped_ptr<TouchLog> touch_log_;
+ std::unique_ptr<TouchLog> touch_log_;
TouchHudCanvas* canvas_;
views::View* label_container_;
« no previous file with comments | « ash/tooltips/tooltip_controller_unittest.cc ('k') | ash/touch/touch_hud_debug.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698