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

Unified Diff: ui/views/event_monitor_aura.cc

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/event_monitor.h ('k') | ui/views/event_monitor_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/event_monitor_aura.cc
diff --git a/ui/views/event_monitor_aura.cc b/ui/views/event_monitor_aura.cc
index 73f55b6bc230a5f97d7a2600709dd0f089273510..6c52620b1571ef37dcbc4edcff0c16240cb4ab63 100644
--- a/ui/views/event_monitor_aura.cc
+++ b/ui/views/event_monitor_aura.cc
@@ -5,6 +5,7 @@
#include "ui/views/event_monitor_aura.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
#include "ui/events/event_target.h"
@@ -12,17 +13,17 @@
namespace views {
// static
-scoped_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor(
+std::unique_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor(
ui::EventHandler* event_handler) {
- return make_scoped_ptr(
+ return base::WrapUnique(
new EventMonitorAura(event_handler, aura::Env::GetInstance()));
}
// static
-scoped_ptr<EventMonitor> EventMonitor::CreateWindowMonitor(
+std::unique_ptr<EventMonitor> EventMonitor::CreateWindowMonitor(
ui::EventHandler* event_handler,
gfx::NativeWindow target_window) {
- return make_scoped_ptr(new EventMonitorAura(event_handler, target_window));
+ return base::WrapUnique(new EventMonitorAura(event_handler, target_window));
}
// static
« no previous file with comments | « ui/views/event_monitor.h ('k') | ui/views/event_monitor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698