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

Side by Side Diff: ui/aura/client/aura_constants.h

Issue 2514243002: Propagates window type properties during aura-mus window creation (Closed)
Patch Set: return Created 4 years 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 UI_AURA_CLIENT_AURA_CONSTANTS_H_ 5 #ifndef UI_AURA_CLIENT_AURA_CONSTANTS_H_
6 #define UI_AURA_CLIENT_AURA_CONSTANTS_H_ 6 #define UI_AURA_CLIENT_AURA_CONSTANTS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
11 #include "third_party/skia/include/core/SkColor.h" 11 #include "third_party/skia/include/core/SkColor.h"
12 #include "ui/aura/aura_export.h" 12 #include "ui/aura/aura_export.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/base/ui_base_types.h" 14 #include "ui/base/ui_base_types.h"
15 15
16 namespace ui { 16 namespace ui {
17 class InputMethod; 17 class InputMethod;
18 namespace mojom {
19 enum class WindowType;
20 }
18 } 21 }
19 22
20 namespace aura { 23 namespace aura {
21 namespace client { 24 namespace client {
22 25
23 // Alphabetical sort. 26 // Alphabetical sort.
24 27
25 // A property key to store always-on-top flag. 28 // A property key to store always-on-top flag.
26 AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey; 29 AURA_EXPORT extern const WindowProperty<bool>* const kAlwaysOnTopKey;
27 30
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // view is the tab strip for tabbed browser windows, the toolbar for popups, 97 // view is the tab strip for tabbed browser windows, the toolbar for popups,
95 // the web contents for app windows and varies for fullscreen windows. 98 // the web contents for app windows and varies for fullscreen windows.
96 AURA_EXPORT extern const aura::WindowProperty<int>* const kTopViewInset; 99 AURA_EXPORT extern const aura::WindowProperty<int>* const kTopViewInset;
97 100
98 // The color of the window header. 101 // The color of the window header.
99 AURA_EXPORT extern const aura::WindowProperty<SkColor>* const kTopViewColor; 102 AURA_EXPORT extern const aura::WindowProperty<SkColor>* const kTopViewColor;
100 103
101 // A property key to store the window icon, typically 16x16 for title bars. 104 // A property key to store the window icon, typically 16x16 for title bars.
102 AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kWindowIconKey; 105 AURA_EXPORT extern const WindowProperty<gfx::ImageSkia*>* const kWindowIconKey;
103 106
107 struct AURA_EXPORT WindowTypeProperty {
108 ui::mojom::WindowType type;
109 };
110
111 AURA_EXPORT extern const aura::WindowProperty<WindowTypeProperty*>* const
msw 2016/11/21 19:26:46 Can we avoid the struct via aura::WindowProperty<u
sky 2016/11/21 22:13:56 I went with the struct so that I can tell whether
112 kWindowTypeKey;
113
104 // Alphabetical sort. 114 // Alphabetical sort.
105 115
106 } // namespace client 116 } // namespace client
107 } // namespace aura 117 } // namespace aura
108 118
109 #endif // UI_AURA_CLIENT_AURA_CONSTANTS_H_ 119 #endif // UI_AURA_CLIENT_AURA_CONSTANTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698