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

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

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Fix struct traits typo. Created 3 years, 7 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 | « ui/aura/client/aura_constants.h ('k') | ui/aura/mus/property_converter.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 (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 "ui/aura/client/aura_constants.h" 5 #include "ui/aura/client/aura_constants.h"
6 6
7 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 7 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
8 #include "ui/base/class_property.h" 8 #include "ui/base/class_property.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 10
(...skipping 18 matching lines...) Expand all
29 namespace client { 29 namespace client {
30 30
31 // Alphabetical sort. 31 // Alphabetical sort.
32 32
33 DEFINE_UI_CLASS_PROPERTY_KEY( 33 DEFINE_UI_CLASS_PROPERTY_KEY(
34 bool, kAccessibilityFocusFallsbackToWidgetKey, true); 34 bool, kAccessibilityFocusFallsbackToWidgetKey, true);
35 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kActivateOnPointerKey, true); 35 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kActivateOnPointerKey, true);
36 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); 36 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);
37 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); 37 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);
38 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); 38 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);
39 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIdKey, nullptr);
40 DEFINE_UI_CLASS_PROPERTY_KEY(int, kAppType, 0); 39 DEFINE_UI_CLASS_PROPERTY_KEY(int, kAppType, 0);
41 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false); 40 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false);
42 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCreatedByUserGesture, false); 41 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCreatedByUserGesture, false);
43 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false); 42 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false);
44 DEFINE_UI_CLASS_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr); 43 DEFINE_UI_CLASS_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr);
45 DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); 44 DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr);
46 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveFullscreenKey, false); 45 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveFullscreenKey, false);
47 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kMirroringEnabledKey, false); 46 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kMirroringEnabledKey, false);
48 DEFINE_UI_CLASS_PROPERTY_KEY(WindowEmbedType, 47 DEFINE_UI_CLASS_PROPERTY_KEY(WindowEmbedType,
49 kEmbedType, 48 kEmbedType,
(...skipping 14 matching lines...) Expand all
64 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); 63 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr);
65 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); 64 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0);
66 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); 65 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);
67 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); 66 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);
68 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, 67 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType,
69 kWindowTypeKey, 68 kWindowTypeKey,
70 ui::mojom::WindowType::UNKNOWN); 69 ui::mojom::WindowType::UNKNOWN);
71 70
72 } // namespace client 71 } // namespace client
73 } // namespace aura 72 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/aura_constants.h ('k') | ui/aura/mus/property_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698