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

Unified Diff: ash/wm/window_properties.h

Issue 10545058: Add UIControlsAsh that works with multiple root windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 8 years, 6 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/ui_controls_ash.cc ('k') | ash/wm/window_properties.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_properties.h
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 9f79a44c439289285e1aa83fe519e28a7efe2552..760bcd430586996faa5cfa466a92f113a0fc592a 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -11,6 +11,10 @@
#include "ui/aura/window.h"
#include "ui/base/ui_base_types.h"
+namespace ui_controls {
+class UIControlsAura;
+}
+
namespace ash {
namespace internal {
@@ -31,6 +35,10 @@ extern const aura::WindowProperty<ui::WindowShowState>* const
// window. If unset, no shadow is displayed.
extern const aura::WindowProperty<ShadowType>* const kShadowTypeKey;
+// Used to store a ui_controls for each root window.
+extern const aura::WindowProperty<ui_controls::UIControlsAura*>* const
+ kUIControlsKey;
+
extern const aura::WindowProperty<WindowPersistsAcrossAllWorkspacesType>* const
kWindowPersistsAcrossAllWorkspacesKey;
« no previous file with comments | « ash/ui_controls_ash.cc ('k') | ash/wm/window_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698