diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 04:52:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 04:52:25 +0000 |
| commit | 054b2d765286cc67de69ed85a10cc74d59dd5aa6 (patch) | |
| tree | 1325b3da3075d9f357ceb371adb0c2466784c06b /ash/wm | |
| parent | fc76114f1758fb679f99f6a303897a11f3715d87 (diff) | |
| download | chromium_src-054b2d765286cc67de69ed85a10cc74d59dd5aa6.zip chromium_src-054b2d765286cc67de69ed85a10cc74d59dd5aa6.tar.gz chromium_src-054b2d765286cc67de69ed85a10cc74d59dd5aa6.tar.bz2 | |
Add UIControlsAsh that works with multiple root windows
I'll add test for this when I add multiple root window support, which should be soon.
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10545058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/window_properties.cc | 5 | ||||
| -rw-r--r-- | ash/wm/window_properties.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index a4a9a90..4b2b80a 100644 --- a/ash/wm/window_properties.cc +++ b/ash/wm/window_properties.cc @@ -6,11 +6,13 @@ #include "ash/wm/shadow_types.h" #include "ui/aura/window_property.h" +#include "ui/ui_controls/ui_controls_aura.h" // Property type for bool and ui::WindowShowState are // defined in aura. DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) +DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) namespace ash { namespace internal { @@ -20,6 +22,9 @@ DEFINE_WINDOW_PROPERTY_KEY( DEFINE_WINDOW_PROPERTY_KEY( ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); +DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura, + kUIControlsKey, + NULL); DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, kWindowPersistsAcrossAllWorkspacesKey, WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h index 9f79a44..760bcd4 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; |