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

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

Issue 10384212: fix property linkage warnings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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.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/wm/shadow_types.h" 7 #include "ash/wm/shadow_types.h"
8 #include "ui/aura/window_property.h" 8 #include "ui/aura/window_property.h"
9 9
10 // Property type for bool and ui::WindowShowState are
11 // defined in aura.
10 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType); 12 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType);
13 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
11 14
12 namespace ash { 15 namespace ash {
13 namespace internal { 16 namespace internal {
17
18 DEFINE_WINDOW_PROPERTY_KEY(
19 bool, kChildWindowVisibilityChangesAnimatedKey, false);
20 DEFINE_WINDOW_PROPERTY_KEY(
21 ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
14 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); 22 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE);
23 DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType,
24 kWindowPersistsAcrossAllWorkspacesKey,
25 WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT);
26 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true);
27
15 } // namespace internal 28 } // namespace internal
16 } // namespace ash 29 } // 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