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

Unified Diff: ui/views/focus/focus_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/views/examples/tree_view_example.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager.h
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index 6d5195e45e605fbbdb593be543b748172895c734..e8eb3a045432364a0177392a1914ab55de09e938 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -7,9 +7,9 @@
#include <list>
#include <map>
+#include <memory>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/accelerators/accelerator_manager.h"
@@ -346,13 +346,13 @@ class VIEWS_EXPORT FocusManager {
// The object which handles an accelerator when |accelerator_manager_| doesn't
// handle it.
- scoped_ptr<FocusManagerDelegate> delegate_;
+ std::unique_ptr<FocusManagerDelegate> delegate_;
// The view that currently is focused.
View* focused_view_;
// The AcceleratorManager this FocusManager is associated with.
- scoped_ptr<ui::AcceleratorManager> accelerator_manager_;
+ std::unique_ptr<ui::AcceleratorManager> accelerator_manager_;
// Keeps track of whether shortcut handling is currently suspended.
bool shortcut_handling_suspended_;
« no previous file with comments | « ui/views/examples/tree_view_example.h ('k') | ui/views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698