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

Unified Diff: ui/wm/core/cursor_manager.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/wm/core/compound_event_filter_unittest.cc ('k') | ui/wm/core/cursor_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/cursor_manager.h
diff --git a/ui/wm/core/cursor_manager.h b/ui/wm/core/cursor_manager.h
index 3e2b86b213df7647fe5a9427694bfd9ebe343f25..679dd0de8c8da98be4bf29033906252ba587412c 100644
--- a/ui/wm/core/cursor_manager.h
+++ b/ui/wm/core/cursor_manager.h
@@ -5,9 +5,10 @@
#ifndef UI_WM_CORE_CURSOR_MANAGER_H_
#define UI_WM_CORE_CURSOR_MANAGER_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/base/cursor/cursor.h"
@@ -39,7 +40,7 @@ class NativeCursorManager;
class WM_EXPORT CursorManager : public aura::client::CursorClient,
public NativeCursorManagerDelegate {
public:
- explicit CursorManager(scoped_ptr<NativeCursorManager> delegate);
+ explicit CursorManager(std::unique_ptr<NativeCursorManager> delegate);
~CursorManager() override;
// Overridden from aura::client::CursorClient:
@@ -68,17 +69,17 @@ class WM_EXPORT CursorManager : public aura::client::CursorClient,
void CommitCursorSet(ui::CursorSetType cursor_set) override;
void CommitMouseEventsEnabled(bool enabled) override;
- scoped_ptr<NativeCursorManager> delegate_;
+ std::unique_ptr<NativeCursorManager> delegate_;
// Number of times LockCursor() has been invoked without a corresponding
// UnlockCursor().
int cursor_lock_count_;
// The current state of the cursor.
- scoped_ptr<internal::CursorState> current_state_;
+ std::unique_ptr<internal::CursorState> current_state_;
// The cursor state to restore when the cursor is unlocked.
- scoped_ptr<internal::CursorState> state_on_unlock_;
+ std::unique_ptr<internal::CursorState> state_on_unlock_;
base::ObserverList<aura::client::CursorClientObserver> observers_;
« no previous file with comments | « ui/wm/core/compound_event_filter_unittest.cc ('k') | ui/wm/core/cursor_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698