Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index a2d8219fc72ff44a9f43147c2d3836b57e3d3122..837550605183be4a0337a37e1cd11a70ff1752d7 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -218,9 +218,9 @@ void SetUsesEasyResizeTargeter(aura::Window* container) { |
-kResizeOutsideBoundsSize); |
gfx::Insets touch_extend = mouse_extend.Scale( |
kResizeOutsideBoundsScaleForTouch); |
- container->SetEventTargeter(scoped_ptr<ui::EventTargeter>( |
- new ::wm::EasyResizeWindowTargeter(container, mouse_extend, |
- touch_extend))); |
+ container->SetEventTargeter( |
+ std::unique_ptr<ui::EventTargeter>(new ::wm::EasyResizeWindowTargeter( |
+ container, mouse_extend, touch_extend))); |
} |
// A window delegate which does nothing. Used to create a window that |
@@ -560,7 +560,7 @@ void RootWindowController::ShowContextMenu(const gfx::Point& location_in_screen, |
ui::MenuSourceType source_type) { |
ShellDelegate* delegate = Shell::GetInstance()->delegate(); |
DCHECK(delegate); |
- scoped_ptr<ui::MenuModel> menu_model( |
+ std::unique_ptr<ui::MenuModel> menu_model( |
delegate->CreateContextMenu(shelf_->shelf(), nullptr)); |
if (!menu_model) |
return; |
@@ -796,11 +796,9 @@ void RootWindowController::InitLayoutManagers() { |
-kResizeOutsideBoundsSize); |
gfx::Insets touch_extend = mouse_extend.Scale( |
kResizeOutsideBoundsScaleForTouch); |
- panel_container->SetEventTargeter(scoped_ptr<ui::EventTargeter>( |
- new AttachedPanelWindowTargeter(panel_container, |
- mouse_extend, |
- touch_extend, |
- panel_layout_manager_))); |
+ panel_container->SetEventTargeter( |
+ std::unique_ptr<ui::EventTargeter>(new AttachedPanelWindowTargeter( |
+ panel_container, mouse_extend, touch_extend, panel_layout_manager_))); |
} |
void RootWindowController::InitTouchHuds() { |