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

Unified Diff: components/mus/ws/window_tree_host_impl.h

Issue 1644773004: Renames some WindowManager classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 years, 11 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 | « components/mus/ws/window_tree_apptest.cc ('k') | components/mus/ws/window_tree_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_tree_host_impl.h
diff --git a/components/mus/ws/window_tree_host_impl.h b/components/mus/ws/window_tree_host_impl.h
index 69e298bd06edde1c7451d4830577787f20e5b4cd..52638da096e26da23c1778f5d697cce35a71eeba 100644
--- a/components/mus/ws/window_tree_host_impl.h
+++ b/components/mus/ws/window_tree_host_impl.h
@@ -51,7 +51,7 @@ class WindowTreeHostImpl : public DisplayManagerDelegate,
mojo::ApplicationImpl* app_impl,
const scoped_refptr<GpuState>& gpu_state,
const scoped_refptr<SurfacesState>& surfaces_state,
- mojom::WindowManagerPtr window_manater);
+ mojom::WindowManagerDeprecatedPtr window_manater);
~WindowTreeHostImpl() override;
// Initializes state that depends on the existence of a WindowTreeHostImpl.
@@ -92,7 +92,9 @@ class WindowTreeHostImpl : public DisplayManagerDelegate,
ConnectionManager* connection_manager() { return connection_manager_; }
- mojom::WindowManager* window_manager() { return window_manager_.get(); }
+ mojom::WindowManagerDeprecated* window_manager() {
+ return window_manager_.get();
+ }
// Returns the root ServerWindow of this viewport.
ServerWindow* root_window() { return root_.get(); }
@@ -220,7 +222,7 @@ class WindowTreeHostImpl : public DisplayManagerDelegate,
scoped_ptr<ServerWindow> root_;
scoped_ptr<DisplayManager> display_manager_;
scoped_ptr<FocusController> focus_controller_;
- mojom::WindowManagerPtr window_manager_;
+ mojom::WindowManagerDeprecatedPtr window_manager_;
mojom::WindowTree* tree_awaiting_input_ack_;
// The last cursor set. Used to track whether we need to change the cursor.
« no previous file with comments | « components/mus/ws/window_tree_apptest.cc ('k') | components/mus/ws/window_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698