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

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

Issue 11343028: Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/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 "ash/wm/shadow_types.h" 10 #include "ash/wm/shadow_types.h"
(...skipping 22 matching lines...) Expand all
33 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*, 33 DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*,
34 kRootWindowControllerKey, NULL); 34 kRootWindowControllerKey, NULL);
35 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE); 35 DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE);
36 DEFINE_WINDOW_PROPERTY_KEY( 36 DEFINE_WINDOW_PROPERTY_KEY(
37 ash::FramePainter*, kSoloWindowFramePainterKey, NULL); 37 ash::FramePainter*, kSoloWindowFramePainterKey, NULL);
38 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false); 38 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura, 39 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ui_controls::UIControlsAura,
40 kUIControlsKey, 40 kUIControlsKey,
41 NULL); 41 NULL);
42 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); 42 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
43 DEFINE_WINDOW_PROPERTY_KEY(bool, kUserChangedWindowPositionOrSizeKey, false);
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);
48 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true); 46 DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowTrackedByWorkspaceKey, true);
49 47
50 } // namespace internal 48 } // namespace internal
51 } // namespace ash 49 } // 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