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

Unified Diff: ui/views/mus/window_manager_connection.h

Issue 1618963005: Revert of Start of display management for mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ui/views/mus/screen_mus.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index af250037613a122d7b31c2e85b11298e6d65489c..ab12a03b05b1d16d1318688ebdf390a864154a79 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -18,9 +18,14 @@
class ApplicationImpl;
}
+namespace ui {
+namespace mojo {
+class UIInit;
+}
+}
+
namespace views {
class NativeWidget;
-class ScreenMus;
namespace internal {
class NativeWidgetDelegate;
}
@@ -55,7 +60,7 @@
mojo::ApplicationImpl* app_;
mus::mojom::WindowManagerPtr window_manager_;
- scoped_ptr<ScreenMus> screen_;
+ scoped_ptr<ui::mojo::UIInit> ui_init_;
scoped_ptr<mus::WindowTreeConnection> window_tree_connection_;
DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
« no previous file with comments | « ui/views/mus/screen_mus.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698