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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_properties.h ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_properties.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index 506d8d6ac48b88026d76ed2c77bcbea8d4c38b62..a4a9a902f0699c8cc0c43024918aab3a9bc74dac 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -7,10 +7,23 @@
#include "ash/wm/shadow_types.h"
#include "ui/aura/window_property.h"
+// Property type for bool and ui::WindowShowState are
+// defined in aura.
DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType);
+DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
namespace ash {
namespace internal {
+
+DEFINE_WINDOW_PROPERTY_KEY(
+ bool, kChildWindowVisibilityChangesAnimatedKey, false);
+DEFINE_WINDOW_PROPERTY_KEY(
+ ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE);
+DEFINE_WINDOW_PROPERTY_KEY(ash::WindowPersistsAcrossAllWorkspacesType,
+ kWindowPersistsAcrossAllWorkspacesKey,
+ WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_DEFAULT);
+DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true);
+
} // namespace internal
} // namespace ash
« 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