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

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

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT Created 3 years, 9 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') | no next file » | 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 17 matching lines...) Expand all
28 // Alphabetical sort. 28 // Alphabetical sort.
29 29
30 DEFINE_UI_CLASS_PROPERTY_KEY( 30 DEFINE_UI_CLASS_PROPERTY_KEY(
31 bool, kAccessibilityFocusFallsbackToWidgetKey, true); 31 bool, kAccessibilityFocusFallsbackToWidgetKey, true);
32 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false); 32 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAlwaysOnTopKey, false);
33 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false); 33 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false);
34 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr); 34 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr);
35 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIdKey, nullptr); 35 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIdKey, nullptr);
36 DEFINE_UI_CLASS_PROPERTY_KEY(int, kAppType, 0); 36 DEFINE_UI_CLASS_PROPERTY_KEY(int, kAppType, 0);
37 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false); 37 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false);
38 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCreatedByUserGesture, false);
38 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false); 39 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false);
39 DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr); 40 DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr);
40 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveFullscreenKey, false); 41 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveFullscreenKey, false);
41 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kMirroringEnabledKey, false); 42 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kMirroringEnabledKey, false);
42 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kTopLevelWindowInWM, false); 43 DEFINE_UI_CLASS_PROPERTY_KEY(bool, kTopLevelWindowInWM, false);
43 DEFINE_UI_CLASS_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); 44 DEFINE_UI_CLASS_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE);
44 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr); 45 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr);
45 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr); 46 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr);
46 DEFINE_UI_CLASS_PROPERTY_KEY( 47 DEFINE_UI_CLASS_PROPERTY_KEY(
47 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT); 48 ui::WindowShowState, kPreMinimizedShowStateKey, ui::SHOW_STATE_DEFAULT);
48 DEFINE_UI_CLASS_PROPERTY_KEY( 49 DEFINE_UI_CLASS_PROPERTY_KEY(
49 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT); 50 ui::WindowShowState, kPreFullscreenShowStateKey, ui::SHOW_STATE_DEFAULT);
50 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, 51 DEFINE_UI_CLASS_PROPERTY_KEY(int32_t,
51 kResizeBehaviorKey, 52 kResizeBehaviorKey,
52 ui::mojom::kResizeBehaviorCanResize); 53 ui::mojom::kResizeBehaviorCanResize);
53 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr); 54 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr);
54 DEFINE_UI_CLASS_PROPERTY_KEY( 55 DEFINE_UI_CLASS_PROPERTY_KEY(
55 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT); 56 ui::WindowShowState, kShowStateKey, ui::SHOW_STATE_DEFAULT);
56 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr); 57 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::string16, kTitleKey, nullptr);
57 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0); 58 DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0);
58 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT); 59 DEFINE_UI_CLASS_PROPERTY_KEY(SkColor, kTopViewColor, SK_ColorTRANSPARENT);
59 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr); 60 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr);
60 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType, 61 DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowType,
61 kWindowTypeKey, 62 kWindowTypeKey,
62 ui::mojom::WindowType::UNKNOWN); 63 ui::mojom::WindowType::UNKNOWN);
63 64
64 } // namespace client 65 } // namespace client
65 } // namespace aura 66 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/aura_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698