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

Unified Diff: components/mus/public/cpp/lib/window_tree_client_impl.h

Issue 1906623003: Convert //components/mus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: components/mus/public/cpp/lib/window_tree_client_impl.h
diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.h b/components/mus/public/cpp/lib/window_tree_client_impl.h
index 3d8d7653abedacd6236e0314a995d77a933bc8d7..4b864a943ce11b70dbd453a0afe5408b8c0e2af4 100644
--- a/components/mus/public/cpp/lib/window_tree_client_impl.h
+++ b/components/mus/public/cpp/lib/window_tree_client_impl.h
@@ -138,13 +138,13 @@ class WindowTreeClientImpl : public WindowTreeConnection,
using IdToWindowMap = std::map<Id, Window*>;
// TODO(sky): this assumes change_ids never wrap, which is a bad assumption.
- using InFlightMap = std::map<uint32_t, scoped_ptr<InFlightChange>>;
+ using InFlightMap = std::map<uint32_t, std::unique_ptr<InFlightChange>>;
// Returns the oldest InFlightChange that matches |change|.
InFlightChange* GetOldestInFlightChangeMatching(const InFlightChange& change);
// See InFlightChange for details on how InFlightChanges are used.
- uint32_t ScheduleInFlightChange(scoped_ptr<InFlightChange> change);
+ uint32_t ScheduleInFlightChange(std::unique_ptr<InFlightChange> change);
// Returns true if there is an InFlightChange that matches |change|. If there
// is an existing change SetRevertValueFrom() is invoked on it. Returns false
@@ -292,7 +292,7 @@ class WindowTreeClientImpl : public WindowTreeConnection,
base::ObserverList<WindowTreeConnectionObserver> observers_;
- scoped_ptr<mojo::AssociatedBinding<mojom::WindowManager>>
+ std::unique_ptr<mojo::AssociatedBinding<mojom::WindowManager>>
window_manager_internal_;
mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
« no previous file with comments | « components/mus/public/cpp/lib/window_surface.cc ('k') | components/mus/public/cpp/lib/window_tree_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698