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

Unified Diff: ash/host/ash_window_tree_host_x11.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/host/ash_window_tree_host_x11.h ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_x11.cc
diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc
index 0949b2a48653a9e29af11b01d24eba34db934547..a0eb7354bd0db8088e49a597e2d642e6f15cf0ae 100644
--- a/ash/host/ash_window_tree_host_x11.cc
+++ b/ash/host/ash_window_tree_host_x11.cc
@@ -111,7 +111,7 @@ void AshWindowTreeHostX11::UnConfineCursor() {
}
void AshWindowTreeHostX11::SetRootWindowTransformer(
- scoped_ptr<RootWindowTransformer> transformer) {
+ std::unique_ptr<RootWindowTransformer> transformer) {
transformer_helper_.SetRootWindowTransformer(std::move(transformer));
if (pointer_barriers_) {
UnConfineCursor();
@@ -131,7 +131,7 @@ void AshWindowTreeHostX11::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));
if (ui::PlatformEventSource::GetInstance()) {
// Block X events which are not turned into ui::Events from getting
« no previous file with comments | « ash/host/ash_window_tree_host_x11.h ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698