diff options
| author | tfarina <tfarina@chromium.org> | 2015-01-08 13:34:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-08 21:35:20 +0000 |
| commit | c999097cef4e2ae05ed554bbc4b85d64928c992d (patch) | |
| tree | 4fdfa22e33cb74e04156d0341f32b0c37942bc8e /ui/views/event_monitor_aura.cc | |
| parent | 8de079a1603cb64121e9c11b0a8556ce39df02e1 (diff) | |
| download | chromium_src-c999097cef4e2ae05ed554bbc4b85d64928c992d.zip chromium_src-c999097cef4e2ae05ed554bbc4b85d64928c992d.tar.gz chromium_src-c999097cef4e2ae05ed554bbc4b85d64928c992d.tar.bz2 | |
ui/views: Cleanup usage of scoped_ptr.
* Return nullptr whenever possible.
* Use make_scoped_ptr() when possible (less typing/noise).
Entries found with the following command line:
$ git grep -E '(=|\breturn)\s*scoped_ptr<.*?>([^)]+)' ui/views
BUG=None
R=sky@chromium.org
Review URL: https://codereview.chromium.org/809903005
Cr-Commit-Position: refs/heads/master@{#310603}
Diffstat (limited to 'ui/views/event_monitor_aura.cc')
| -rw-r--r-- | ui/views/event_monitor_aura.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/views/event_monitor_aura.cc b/ui/views/event_monitor_aura.cc index f5331d7..73f55b6 100644 --- a/ui/views/event_monitor_aura.cc +++ b/ui/views/event_monitor_aura.cc @@ -14,7 +14,7 @@ namespace views { // static scoped_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor( ui::EventHandler* event_handler) { - return scoped_ptr<EventMonitor>( + return make_scoped_ptr( new EventMonitorAura(event_handler, aura::Env::GetInstance())); } @@ -22,8 +22,7 @@ scoped_ptr<EventMonitor> EventMonitor::CreateApplicationMonitor( scoped_ptr<EventMonitor> EventMonitor::CreateWindowMonitor( ui::EventHandler* event_handler, gfx::NativeWindow target_window) { - return scoped_ptr<EventMonitor>( - new EventMonitorAura(event_handler, target_window)); + return make_scoped_ptr(new EventMonitorAura(event_handler, target_window)); } // static |