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

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

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)
Patch Set: Sync and rebase; add 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
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 #ifndef ASH_WM_WINDOW_PROPERTIES_H_ 5 #ifndef ASH_WM_WINDOW_PROPERTIES_H_
6 #define ASH_WM_WINDOW_PROPERTIES_H_ 6 #define ASH_WM_WINDOW_PROPERTIES_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/shelf/shelf_item_types.h"
9 #include "ui/base/ui_base_types.h" 10 #include "ui/base/ui_base_types.h"
10 #include "ui/gfx/geometry/rect.h" 11 #include "ui/gfx/geometry/rect.h"
11 12
12 namespace aura { 13 namespace aura {
13 class Window; 14 class Window;
14 15
15 template <typename T> 16 template <typename T>
16 struct WindowProperty; 17 struct WindowProperty;
17 } 18 }
18 19
(...skipping 16 matching lines...) Expand all
35 // maximized mode window manager. 36 // maximized mode window manager.
36 ASH_EXPORT extern const aura::WindowProperty<gfx::Rect*>* const 37 ASH_EXPORT extern const aura::WindowProperty<gfx::Rect*>* const
37 kRestoreBoundsOverrideKey; 38 kRestoreBoundsOverrideKey;
38 39
39 // A property key which stores the bounds to restore a window to. These take 40 // A property key which stores the bounds to restore a window to. These take
40 // preference over the current bounds/state if |kRestoreBoundsOverrideKey| is 41 // preference over the current bounds/state if |kRestoreBoundsOverrideKey| is
41 // set. This is used by e.g. the always maximized mode window manager. 42 // set. This is used by e.g. the always maximized mode window manager.
42 ASH_EXPORT extern const aura::WindowProperty<ui::WindowShowState>* const 43 ASH_EXPORT extern const aura::WindowProperty<ui::WindowShowState>* const
43 kRestoreShowStateOverrideKey; 44 kRestoreShowStateOverrideKey;
44 45
46 // A property key to store the icon resource id for a window's shelf item.
James Cook 2016/10/01 00:16:20 Hooray for nice docs on property keys.
msw 2016/10/03 19:14:22 Acknowledged.
47 ASH_EXPORT extern const aura::WindowProperty<int>* const
48 kShelfIconResourceIdKey;
49
50 // A property key to store the id for a window's shelf item.
51 ASH_EXPORT extern const aura::WindowProperty<ShelfID>* const kShelfIDKey;
52
53 // A property key to store the type of a window's shelf item.
54 ASH_EXPORT extern const aura::WindowProperty<int>* const kShelfItemTypeKey;
55
45 // Containers with this property (true) are aligned with physical pixel 56 // Containers with this property (true) are aligned with physical pixel
46 // boundary. 57 // boundary.
47 extern const aura::WindowProperty<bool>* const kSnapChildrenToPixelBoundary; 58 extern const aura::WindowProperty<bool>* const kSnapChildrenToPixelBoundary;
48 59
49 // Property to tell if the container uses the screen coordinates. 60 // Property to tell if the container uses the screen coordinates.
50 extern const aura::WindowProperty<bool>* const kUsesScreenCoordinatesKey; 61 extern const aura::WindowProperty<bool>* const kUsesScreenCoordinatesKey;
51 62
52 // A property key to store WindowState in the window. The window state 63 // A property key to store WindowState in the window. The window state
53 // is owned by the window. 64 // is owned by the window.
54 extern const aura::WindowProperty<wm::WindowState*>* const kWindowStateKey; 65 extern const aura::WindowProperty<wm::WindowState*>* const kWindowStateKey;
55 66
56 // Alphabetical sort. 67 // Alphabetical sort.
57 68
58 } // namespace ash 69 } // namespace ash
59 70
60 #endif // ASH_WM_WINDOW_PROPERTIES_H_ 71 #endif // ASH_WM_WINDOW_PROPERTIES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698