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

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

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)
Patch Set: Address comments. Created 4 years, 2 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') | chrome/browser/ui/BUILD.gn » ('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 11
12 namespace ash { 12 namespace ash {
13 13
14 DEFINE_WINDOW_PROPERTY_KEY(bool, kLockedToRootKey, false); 14 DEFINE_WINDOW_PROPERTY_KEY(bool, kLockedToRootKey, false);
15 15
16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL); 16 DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
17 17
18 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState, 18 DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
19 kRestoreShowStateOverrideKey, 19 kRestoreShowStateOverrideKey,
20 ui::SHOW_STATE_DEFAULT); 20 ui::SHOW_STATE_DEFAULT);
21 21
22 DEFINE_WINDOW_PROPERTY_KEY(int,
23 kShelfIconResourceIdKey,
24 kInvalidImageResourceID);
25
26 DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
27
28 DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);
29
22 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false); 30 DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
23 31
24 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false); 32 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
25 33
26 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL); 34 DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL);
27 35
28 } // namespace ash 36 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_properties.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698