diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 09:34:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 09:34:56 +0000 |
| commit | d90b839ad378031602d5dbdf846c58994d451403 (patch) | |
| tree | 013c72c390c7a7e4e9cb76f03a6c9eb29c7d68a2 /ash/wm/window_properties.cc | |
| parent | 7bc8299dccc300184e850e1a76db110a85234db1 (diff) | |
| download | chromium_src-d90b839ad378031602d5dbdf846c58994d451403.zip chromium_src-d90b839ad378031602d5dbdf846c58994d451403.tar.gz chromium_src-d90b839ad378031602d5dbdf846c58994d451403.tar.bz2 | |
Reland r141871.
Add RootWindowController that keeps per root window state.
Cleanup Shell::Init(). Separated initialization that are specific to shell, root window and primary display.
I also did small cleanup in detor. I'll do more cleanups when I have a chance.
BUG=123160
TEST=no functional change. all tests should pass.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=141871
Review URL: https://chromiumcodereview.appspot.com/10546024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_properties.cc')
| -rw-r--r-- | ash/wm/window_properties.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index 7f15c5b..a312149 100644 --- a/ash/wm/window_properties.cc +++ b/ash/wm/window_properties.cc @@ -4,6 +4,7 @@ #include "ash/wm/window_properties.h" +#include "ash/root_window_controller.h" #include "ash/wm/always_on_top_controller.h" #include "ash/wm/shadow_types.h" #include "ui/aura/window_property.h" @@ -15,6 +16,7 @@ DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) +DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); namespace ash { namespace internal { @@ -33,6 +35,8 @@ DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, kWindowPersistsAcrossAllWorkspacesKey, WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); +DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, + kRootWindowControllerKey, NULL); } // namespace internal } // namespace ash |