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

Unified Diff: ash/mus/bridge/shell_port_mash.h

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: merge Created 3 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/mus/ash_window_tree_host_mus.cc ('k') | ash/mus/bridge/shell_port_mash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/shell_port_mash.h
diff --git a/ash/mus/bridge/shell_port_mash.h b/ash/mus/bridge/shell_port_mash.h
index 4bee8640fd40692b8b01f5af1848fe1b35b89be2..2456370be5d01761236214e1e9f76bfb890cecf2 100644
--- a/ash/mus/bridge/shell_port_mash.h
+++ b/ash/mus/bridge/shell_port_mash.h
@@ -140,6 +140,7 @@ class ShellPortMash : public ShellPort {
WindowManager* window_manager_;
+ // TODO(sky): remove this once mash supports simple display management.
WmWindow* primary_root_window_;
// Only one of |mash_state_| or |mus_state_| is created, depending upon
« no previous file with comments | « ash/mus/ash_window_tree_host_mus.cc ('k') | ash/mus/bridge/shell_port_mash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698