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

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

Issue 2613793002: Removes/promotes functions from WmWindowMus to WmWindowAura (Closed)
Patch Set: move WmWindowAuraTestApi to ash/test Created 3 years, 11 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
« no previous file with comments | « ash/wm/window_properties.h ('k') | ui/views/widget/native_widget_aura.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/common/wm/window_state.h" 7 #include "ash/common/wm/window_state.h"
8 #include "ui/aura/window_property.h" 8 #include "ui/aura/window_property.h"
9 9
10 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); 10 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*);
11 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
11 12
12 namespace ash { 13 namespace ash {
13 14
14 DEFINE_WINDOW_PROPERTY_KEY(bool, kLockedToRootKey, false); 15 DEFINE_WINDOW_PROPERTY_KEY(bool, kLockedToRootKey, false);
15 16
16 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true); 17 DEFINE_WINDOW_PROPERTY_KEY(bool, kPanelAttachedKey, true);
17 18
18 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); 19 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
19 20
20 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, 21 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
21 kRestoreShowStateOverrideKey, 22 kRestoreShowStateOverrideKey,
22 ui::SHOW_STATE_DEFAULT); 23 ui::SHOW_STATE_DEFAULT);
23 24
24 DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID); 25 DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
25 26
26 DEFINE_WINDOW_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED); 27 DEFINE_WINDOW_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
27 28
28 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); 29 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
29 30
30 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); 31 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
31 32
33 DEFINE_WINDOW_PROPERTY_KEY(WidgetCreationType,
34 kWidgetCreationTypeKey,
35 WidgetCreationType::INTERNAL);
36
32 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL); 37 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL);
33 38
34 } // namespace ash 39 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_properties.h ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698