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

Unified Diff: ash/display/cursor_window_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/dip_unittest.cc ('k') | ash/display/display_animator_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/cursor_window_controller.h
diff --git a/ash/display/cursor_window_controller.h b/ash/display/cursor_window_controller.h
index 447be03e25df2fc6d80884ae7ca8500b0b1f62aa..a0510c62df842cbe956cd58eca38fd605a877e2a 100644
--- a/ash/display/cursor_window_controller.h
+++ b/ash/display/cursor_window_controller.h
@@ -5,6 +5,8 @@
#ifndef ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
#define ASH_DISPLAY_CURSOR_WINDOW_CONTROLLER_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "base/macros.h"
#include "ui/aura/window.h"
@@ -87,8 +89,8 @@ class ASH_EXPORT CursorWindowController {
// For mirroring mode, the display is always the primary display.
gfx::Display display_;
- scoped_ptr<aura::Window> cursor_window_;
- scoped_ptr<CursorWindowDelegate> delegate_;
+ std::unique_ptr<aura::Window> cursor_window_;
+ std::unique_ptr<CursorWindowDelegate> delegate_;
DISALLOW_COPY_AND_ASSIGN(CursorWindowController);
};
« no previous file with comments | « ash/dip_unittest.cc ('k') | ash/display/display_animator_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698