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

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

Issue 11418224: Eliminates all ash dependencies from WindowModalityController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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.cc » ('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/root_window_controller.h"
8 #include "ash/wm/always_on_top_controller.h" 8 #include "ash/wm/always_on_top_controller.h"
9 #include "ash/wm/frame_painter.h" 9 #include "ash/wm/frame_painter.h"
10 #include "ui/aura/window_property.h" 10 #include "ui/aura/window_property.h"
11 #include "ui/gfx/rect.h" 11 #include "ui/gfx/rect.h"
12 #include "ui/ui_controls/ui_controls_aura.h" 12 #include "ui/ui_controls/ui_controls_aura.h"
13 13
14 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*); 14 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*);
15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*); 15 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*);
16 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType) 16 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
17 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) 17 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
18 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*); 18 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::RootWindowController*);
19 19
20 namespace ash { 20 namespace ash {
21 namespace internal { 21 namespace internal {
22 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController, 22 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::internal::AlwaysOnTopController,
23 kAlwaysOnTopControllerKey, 23 kAlwaysOnTopControllerKey,
24 NULL); 24 NULL);
25 DEFINE_WINDOW_PROPERTY_KEY( 25 DEFINE_WINDOW_PROPERTY_KEY(
26 bool, kChildWindowVisibilityChangesAnimatedKey, false); 26 bool, kChildWindowVisibilityChangesAnimatedKey, false);
27 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false); 27 DEFINE_WINDOW_PROPERTY_KEY(bool, kIgnoredByShelfKey, false);
28 DEFINE_WINDOW_PROPERTY_KEY(aura::Window*, kModalParentKey, NULL);
29 DEFINE_WINDOW_PROPERTY_KEY( 28 DEFINE_WINDOW_PROPERTY_KEY(
30 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT); 29 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
31 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, 30 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*,
32 kRootWindowControllerKey, NULL); 31 kRootWindowControllerKey, NULL);
33 DEFINE_WINDOW_PROPERTY_KEY( 32 DEFINE_WINDOW_PROPERTY_KEY(
34 ash::FramePainter*, kSoloWindowFramePainterKey, NULL); 33 ash::FramePainter*, kSoloWindowFramePainterKey, NULL);
35 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); 34 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
36 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura, 35 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
37 kUIControlsKey, 36 kUIControlsKey,
38 NULL); 37 NULL);
39 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); 38 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
40 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false); 39 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false);
41 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, 40 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect,
42 kPreAutoManagedWindowBoundsKey, 41 kPreAutoManagedWindowBoundsKey,
43 NULL); 42 NULL);
44 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType, 43 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType,
45 kWindowPersistsAcrossAllWorkspacesKey, 44 kWindowPersistsAcrossAllWorkspacesKey,
46 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT); 45 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT);
47 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false); 46 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowPositionManagedKey, false);
48 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); 47 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true);
49 48
50 } // namespace internal 49 } // namespace internal
51 } // namespace ash 50 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_properties.h ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698