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

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

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index de6ef61cd636fd0809b6b350e82b074e08e38822..69086afd816ffab6fe6b70315e7dadfce61ad0d7 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include <map>
#include <memory>
#include <vector>
@@ -144,6 +145,10 @@ class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
base::ObserverList<WmActivationObserver> activation_observers_;
+ // A cache of stub display info objects, used in absence of DisplayManager.
+ // TODO(mash): Get actual info from DisplayManager. http://crbug.com/622480.
+ mutable std::map<int64_t, display::ManagedDisplayInfo> display_info_map_;
+
DISALLOW_COPY_AND_ASSIGN(WmShellMus);
};
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | ash/mus/bridge/wm_shell_mus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698