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

Side by Side Diff: ash/common/wm_window_property.h

Issue 2514473003: Replace IDR window property use with gfx::ImageSkia icons. (Closed)
Patch Set: Add owership comments. Created 4 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
« no previous file with comments | « ash/common/shelf/shelf_window_watcher_unittest.cc ('k') | ash/mus/bridge/wm_window_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_WINDOW_PROPERTY_H_ 5 #ifndef ASH_COMMON_WM_WINDOW_PROPERTY_H_
6 #define ASH_COMMON_WM_WINDOW_PROPERTY_H_ 6 #define ASH_COMMON_WM_WINDOW_PROPERTY_H_
7 7
8 namespace ash { 8 namespace ash {
9 9
10 // See ui/aura/client/aura_constants.h for some more detailed descriptions. 10 // See ui/aura/client/aura_constants.h for some more detailed descriptions.
(...skipping 13 matching lines...) Expand all
24 // Type bool. 24 // Type bool.
25 DRAW_ATTENTION, 25 DRAW_ATTENTION,
26 26
27 // Type bool. See aura::client:kExcludeFromMruKey for details. 27 // Type bool. See aura::client:kExcludeFromMruKey for details.
28 EXCLUDE_FROM_MRU, 28 EXCLUDE_FROM_MRU,
29 29
30 // Type int, but cast to ui::ModalType. 30 // Type int, but cast to ui::ModalType.
31 MODAL_TYPE, 31 MODAL_TYPE,
32 32
33 // Type int. 33 // Type int.
34 SHELF_ICON_RESOURCE_ID,
35
36 // Type int.
37 SHELF_ID, 34 SHELF_ID,
38 35
39 // Type int, but cast to ShelfItemType. 36 // Type int, but cast to ShelfItemType.
40 SHELF_ITEM_TYPE, 37 SHELF_ITEM_TYPE,
41 38
42 // Type bool. 39 // Type bool.
43 SNAP_CHILDREN_TO_PIXEL_BOUNDARY, 40 SNAP_CHILDREN_TO_PIXEL_BOUNDARY,
44 41
45 // Type SkColor. See aura::client::kTopViewColor for details. 42 // Type SkColor. See aura::client::kTopViewColor for details.
46 TOP_VIEW_COLOR, 43 TOP_VIEW_COLOR,
47 44
48 // Type int. See aura::client::kTopViewInset for details. 45 // Type int. See aura::client::kTopViewInset for details.
49 TOP_VIEW_INSET, 46 TOP_VIEW_INSET,
50 47
51 // Type ImageSkia. 48 // Type ImageSkia.
52 WINDOW_ICON, 49 WINDOW_ICON,
53 }; 50 };
54 51
55 } // namespace ash 52 } // namespace ash
56 53
57 #endif // ASH_COMMON_WM_WINDOW_PROPERTY_H_ 54 #endif // ASH_COMMON_WM_WINDOW_PROPERTY_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_window_watcher_unittest.cc ('k') | ash/mus/bridge/wm_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698