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

Unified Diff: ash/root_window_controller.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/root_window_controller.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698