| Index: ash/host/ash_window_tree_host_platform.cc
|
| diff --git a/ash/host/ash_window_tree_host_platform.cc b/ash/host/ash_window_tree_host_platform.cc
|
| index 88e8be3d8ca6ddc9f80109fa97685ca6e8e359eb..462787af99ab453fe6fefa685fc226c5152c8b6f 100644
|
| --- a/ash/host/ash_window_tree_host_platform.cc
|
| +++ b/ash/host/ash_window_tree_host_platform.cc
|
| @@ -54,7 +54,7 @@ void AshWindowTreeHostPlatform::UnConfineCursor() {
|
| }
|
|
|
| void AshWindowTreeHostPlatform::SetRootWindowTransformer(
|
| - scoped_ptr<RootWindowTransformer> transformer) {
|
| + std::unique_ptr<RootWindowTransformer> transformer) {
|
| transformer_helper_.SetRootWindowTransformer(std::move(transformer));
|
| ConfineCursorToRootWindow();
|
| }
|
| @@ -73,7 +73,7 @@ void AshWindowTreeHostPlatform::PrepareForShutdown() {
|
| // ui::EventHandlers to be unable to convert the event's location to screen
|
| // coordinates.
|
| window()->SetEventTargeter(
|
| - scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter));
|
| + std::unique_ptr<ui::EventTargeter>(new ui::NullEventTargeter));
|
| }
|
|
|
| void AshWindowTreeHostPlatform::SetRootTransform(
|
|
|