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

Unified Diff: ui/base/accelerators/accelerator.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/aura/window_unittest.cc ('k') | ui/base/accelerators/platform_accelerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/accelerators/accelerator.h
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
index 0a02e39d4cc1a4817a4ee5d2106e72b9b38dd472..e3f079cb07fe41ee58161f9ae6ce6629cdcdec6e 100644
--- a/ui/base/accelerators/accelerator.h
+++ b/ui/base/accelerators/accelerator.h
@@ -11,9 +11,9 @@
#ifndef UI_BASE_ACCELERATORS_ACCELERATOR_H_
#define UI_BASE_ACCELERATORS_ACCELERATOR_H_
+#include <memory>
#include <utility>
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "ui/base/accelerators/platform_accelerator.h"
#include "ui/base/ui_base_export.h"
@@ -67,7 +67,7 @@ class UI_BASE_EXPORT Accelerator {
// Returns a string with the localized shortcut if any.
base::string16 GetShortcutText() const;
- void set_platform_accelerator(scoped_ptr<PlatformAccelerator> p) {
+ void set_platform_accelerator(std::unique_ptr<PlatformAccelerator> p) {
platform_accelerator_ = std::move(p);
}
@@ -92,7 +92,7 @@ class UI_BASE_EXPORT Accelerator {
bool is_repeat_;
// Stores platform specific data. May be NULL.
- scoped_ptr<PlatformAccelerator> platform_accelerator_;
+ std::unique_ptr<PlatformAccelerator> platform_accelerator_;
};
// An interface that classes that want to register for keyboard accelerators
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/base/accelerators/platform_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698