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

Side by Side Diff: ash/wm/window_properties.cc

Issue 10546024: Add RootWindowController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/window_properties.h ('k') | ash/wm/window_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/window_properties.h" 5 #include "ash/wm/window_properties.h"
6 6
7 #include "ash/root_window_controller.h"
7 #include "ash/wm/always_on_top_controller.h" 8 #include "ash/wm/always_on_top_controller.h"
8 #include "ash/wm/shadow_types.h" 9 #include "ash/wm/shadow_types.h"
9 #include "ui/aura/window_property.h" 10 #include "ui/aura/window_property.h"
10 #include "ui/ui_controls/ui_controls_aura.h" 11 #include "ui/ui_controls/ui_controls_aura.h"
11 12
12 // Property type for bool and ui::WindowShowState are 13 // Property type for bool and ui::WindowShowState are
13 // defined in aura. 14 // defined in aura.
14 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); 15 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*);
15 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType);
16 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) 17 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
17 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) 18 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
19 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*);
18 20
19 namespace ash { 21 namespace ash {
20 namespace internal { 22 namespace internal {
21 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, 23 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController,
22 kAlwaysOnTopControllerKey, 24 kAlwaysOnTopControllerKey,
23 NULL); 25 NULL);
24 DEFINE_WINDOW_PROPERTY_KEY( 26 DEFINE_WINDOW_PROPERTY_KEY(
25 bool, kChildWindowVisibilityChangesAnimatedKey, false); 27 bool, kChildWindowVisibilityChangesAnimatedKey, false);
26 DEFINE_WINDOW_PROPERTY_KEY( 28 DEFINE_WINDOW_PROPERTY_KEY(
27 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); 29 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
28 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); 30 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE);
29 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura, 31 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
30 kUIControlsKey, 32 kUIControlsKey,
31 NULL); 33 NULL);
32 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, 34 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType,
33 kWindowPersistsAcrossAllWorkspacesKey, 35 kWindowPersistsAcrossAllWorkspacesKey,
34 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); 36 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT);
35 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); 37 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true);
38 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*,
39 kRootWindowControllerKey, NULL);
36 40
37 } // namespace internal 41 } // namespace internal
38 } // namespace ash 42 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_properties.h ('k') | ash/wm/window_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698