chromium/src
0
Fork 0
Code Activity

Eliminate useless "default" arg for owned class property keys.

Browse Source 
All users already set this to null.

Bug: 364987728
Change-Id: I8130fa418577bbbf2bd4dbaa9f190475b520961e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6112734
Owners-Override: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1399248}
This commit is contained in:
Peter Kasting
2024-12-20 09:53:56 -08:00
committed by Chromium LUCI CQ
parent 6cd803f135
commit 59ff9dc060
38 changed files with 89 additions and 137 deletions

3
ash/capture_mode/capture_mode_session_focus_cycler.cc

@@ -48,8 +48,7 @@ namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY( DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(
CaptureModeSessionFocusCycler::HighlightHelper, CaptureModeSessionFocusCycler::HighlightHelper,
kCaptureModeHighlightHelper, kCaptureModeHighlightHelper)
nullptr)
// The focusable items for the FocusGroup::kSelection group. // The focusable items for the FocusGroup::kSelection group.
constexpr std::array<FineTunePosition, 9> kSelectionTabbingOrder = { constexpr std::array<FineTunePosition, 9> kSelectionTabbingOrder = {

28
ash/public/cpp/window_properties.cc

@@ -27,15 +27,15 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_PUBLIC_EXPORT, uint64_t)
namespace ash { namespace ash {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIDKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIDKey)
DEFINE_UI_CLASS_PROPERTY_KEY(ArcGameControlsFlag, DEFINE_UI_CLASS_PROPERTY_KEY(ArcGameControlsFlag,
kArcGameControlsFlagsKey, kArcGameControlsFlagsKey,
static_cast<ArcGameControlsFlag>(0)) static_cast<ArcGameControlsFlag>(0))
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kArcPackageNameKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kArcPackageNameKey)
DEFINE_UI_CLASS_PROPERTY_KEY(ArcResizeLockType, DEFINE_UI_CLASS_PROPERTY_KEY(ArcResizeLockType,
kArcResizeLockTypeKey, kArcResizeLockTypeKey,
ArcResizeLockType::NONE) ArcResizeLockType::NONE)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WindowBackdrop, kWindowBackdropKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WindowBackdrop, kWindowBackdropKey)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCanConsumeSystemKeysKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCanConsumeSystemKeysKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kClientAccessibilityIdKey, -1) DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kClientAccessibilityIdKey, -1)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kExcludeInMruKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kExcludeInMruKey, false)
@@ -47,32 +47,24 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIsDraggingTabsKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideInDeskMiniViewKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideInDeskMiniViewKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kForceVisibleInMiniViewKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kForceVisibleInMiniViewKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(uint64_t, kLacrosProfileId, 0) DEFINE_UI_CLASS_PROPERTY_KEY(uint64_t, kLacrosProfileId, 0)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(bool, kMinimizeOnBackKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(bool, kMinimizeOnBackKey)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPipOriginalWindowKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPipOriginalWindowKey, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(float, kPipSnapFractionKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(float, kPipSnapFractionKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kUnresizableSnappedSizeKey)
kUnresizableSnappedSizeKey,
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRenderTitleAreaProperty, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRenderTitleAreaProperty, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey)
kRestoreBoundsOverrideKey,
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(chromeos::WindowStateType, DEFINE_UI_CLASS_PROPERTY_KEY(chromeos::WindowStateType,
kRestoreWindowStateTypeOverrideKey, kRestoreWindowStateTypeOverrideKey,
chromeos::WindowStateType::kDefault) chromeos::WindowStateType::kDefault)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSearchKeyAcceleratorReservedKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSearchKeyAcceleratorReservedKey, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kShelfIDKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kShelfIDKey)
DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED) DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(SkRegion, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(SkRegion, kSystemGestureExclusionKey)
kSystemGestureExclusionKey,
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowPositionManagedTypeKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowPositionManagedTypeKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kShowCursorOnKeypress, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kShowCursorOnKeypress, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowPipTypeKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowPipTypeKey, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kWindowPipResizeHandleBoundsKey)
kWindowPipResizeHandleBoundsKey,
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(ResizeShadowType, DEFINE_UI_CLASS_PROPERTY_KEY(ResizeShadowType,
kResizeShadowTypeKey, kResizeShadowTypeKey,
ResizeShadowType::kUnlock) ResizeShadowType::kUnlock)

4
ash/root_window_settings.cc

@@ -13,9 +13,7 @@ DEFINE_UI_CLASS_PROPERTY_TYPE(ash::RootWindowSettings*)
namespace ash { namespace ash {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(RootWindowSettings, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(RootWindowSettings, kRootWindowSettingsKey)
kRootWindowSettingsKey,
nullptr)
RootWindowSettings::RootWindowSettings() RootWindowSettings::RootWindowSettings()
: display_id(display::kInvalidDisplayId), controller(nullptr) {} : display_id(display::kInvalidDisplayId), controller(nullptr) {}

2
ash/system/cast/media_cast_list_view.cc

@@ -39,7 +39,7 @@ namespace ash {
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kDeviceIdKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kDeviceIdKey)
// Extra spacing to add between cast stop buttons and the edge of `tri_view()` // Extra spacing to add between cast stop buttons and the edge of `tri_view()`
// header entry. // header entry.

2
ash/test/ui_controls_ash.cc

@@ -23,7 +23,7 @@ namespace {
using ui_controls::MouseButton; using ui_controls::MouseButton;
using ui_controls::UIControlsAura; using ui_controls::UIControlsAura;
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(UIControlsAura, kUIControlsKey, NULL) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(UIControlsAura, kUIControlsKey)
// Returns the UIControls object for RootWindow. // Returns the UIControls object for RootWindow.
// kUIControlsKey is owned property and UIControls object // kUIControlsKey is owned property and UIControls object

4
ash/utility/layer_copy_animator.cc

@@ -16,9 +16,7 @@ DEFINE_UI_CLASS_PROPERTY_TYPE(ash::LayerCopyAnimator*)
namespace ash { namespace ash {
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayerCopyAnimator, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayerCopyAnimator, kLayerCopyAnimatorKey)
kLayerCopyAnimatorKey,
nullptr)
// CopyOutputRequest's callback may be called on the different thread during // CopyOutputRequest's callback may be called on the different thread during
// shutdown, which results in the DCHECK failure in the weak ptr when // shutdown, which results in the DCHECK failure in the weak ptr when

13
ash/wm/window_properties.cc

@@ -25,16 +25,13 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kOverviewUiKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kStayInOverviewOnActivationKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kStayInOverviewOnActivationKey, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kWebAuthnRequestId, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kWebAuthnRequestId)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kWindowResizeHistogramName)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string,
kWindowResizeHistogramName, kWindowResizeMaxLatencyHistogramName)
nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WindowState, kWindowStateKey)
kWindowResizeMaxLatencyHistogramName,
nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WindowState, kWindowStateKey, nullptr)
} // namespace ash } // namespace ash

4
ash/wm/wm_shadow_controller_delegate.cc

@@ -59,9 +59,7 @@ class ShadowColorizer : public ui::ColorProviderSourceObserver {
} // namespace } // namespace
DEFINE_UI_CLASS_PROPERTY_TYPE(ShadowColorizer*) DEFINE_UI_CLASS_PROPERTY_TYPE(ShadowColorizer*)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ShadowColorizer, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ShadowColorizer, kShadowColorizerKey)
kShadowColorizerKey,
nullptr)
namespace ash { namespace ash {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

3
ash/wm/workspace_controller.cc

@@ -30,8 +30,7 @@ ASH_EXPORT extern const aura::WindowProperty<ash::WorkspaceController*>* const
DEFINE_UI_CLASS_PROPERTY_TYPE(ash::WorkspaceController*) DEFINE_UI_CLASS_PROPERTY_TYPE(ash::WorkspaceController*)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::WorkspaceController, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ash::WorkspaceController,
kWorkspaceController, kWorkspaceController)
nullptr)
namespace ash { namespace ash {
namespace { namespace {

2
chrome/browser/ash/borealis/borealis_window_manager.cc

@@ -32,7 +32,7 @@ const char kBorealisAnonymousPrefix[] = "borealis_anon:";
const int kSteamClientGameId = 769; const int kSteamClientGameId = 769;
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kShelfAppIdKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kShelfAppIdKey)
// Returns an ID for this window, as set by the Wayland client that created it. // Returns an ID for this window, as set by the Wayland client that created it.
// //

3
chrome/browser/ui/views/side_panel/side_panel_content_proxy.cc

@@ -6,8 +6,7 @@
DEFINE_UI_CLASS_PROPERTY_TYPE(SidePanelContentProxy*) DEFINE_UI_CLASS_PROPERTY_TYPE(SidePanelContentProxy*)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(SidePanelContentProxy, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(SidePanelContentProxy,
kSidePanelContentProxyKey, kSidePanelContentProxyKey)
nullptr)
SidePanelContentProxy::SidePanelContentProxy(bool available) SidePanelContentProxy::SidePanelContentProxy(bool available)
: available_(available) {} : available_(available) {}

2
chrome/browser/ui/views/theme_profile_key.cc

@@ -39,7 +39,7 @@ class ProfileTracker : public ProfileObserver {
DEFINE_UI_CLASS_PROPERTY_TYPE(ProfileTracker*) DEFINE_UI_CLASS_PROPERTY_TYPE(ProfileTracker*)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ProfileTracker, kThemeProfileKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ProfileTracker, kThemeProfileKey)
void SetThemeProfileForWindow(aura::Window* window, Profile* profile) { void SetThemeProfileForWindow(aura::Window* window, Profile* profile) {
window->SetProperty(kThemeProfileKey, window->SetProperty(kThemeProfileKey,

7
chromeos/ui/base/window_properties.cc

@@ -42,8 +42,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kHideShelfWhenFullscreenKey, true)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveImpliedByFullscreen, true) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveImpliedByFullscreen, true)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveIsActive, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kImmersiveIsActive, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect,
kImmersiveTopContainerBoundsInScreen, kImmersiveTopContainerBoundsInScreen)
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIsGameKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIsGameKey, false)
@@ -55,9 +54,7 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSupportsFloatedStateKey, true)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowManagerManagesOpacityKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowManagerManagesOpacityKey, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::u16string, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::u16string, kWindowOverviewTitleKey)
kWindowOverviewTitleKey,
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(WindowStateType, DEFINE_UI_CLASS_PROPERTY_KEY(WindowStateType,
kWindowStateTypeKey, kWindowStateTypeKey,

4
chromeos/ui/wm/desks/lacros/desks_helper.cc

@@ -55,9 +55,7 @@ class DesksHelperLacros : public chromeos::DesksHelper {
raw_ptr<aura::Window> window_; raw_ptr<aura::Window> window_;
}; };
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DesksHelperLacros, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DesksHelperLacros, kDesksHelperLacrosKey)
kDesksHelperLacrosKey,
nullptr)
} // namespace } // namespace

8
components/app_restore/window_properties.cc

@@ -12,16 +12,16 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(COMPONENT_EXPORT(APP_RESTORE),
namespace app_restore { namespace app_restore {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(int32_t, kActivationIndexKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(int32_t, kActivationIndexKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIdKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kAppIdKey)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAppTypeBrowser, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAppTypeBrowser, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kBrowserAppNameKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kBrowserAppNameKey)
DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kGhostWindowSessionIdKey, 0) DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kGhostWindowSessionIdKey, 0)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLaunchedFromAppRestoreKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLaunchedFromAppRestoreKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kParentToHiddenContainerKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kParentToHiddenContainerKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRealArcTaskWindow, true) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRealArcTaskWindow, true)
DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kRestoreWindowIdKey, 0) DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kRestoreWindowIdKey, 0)
DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kWindowIdKey, 0) DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kWindowIdKey, 0)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WindowInfo, kWindowInfoKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WindowInfo, kWindowInfoKey)
} // namespace app_restore } // namespace app_restore

3
components/constrained_window/constrained_window_views.cc

@@ -37,8 +37,7 @@ using web_modal::ModalDialogHostObserver;
DEFINE_UI_CLASS_PROPERTY_TYPE(ModalDialogHostObserver*) DEFINE_UI_CLASS_PROPERTY_TYPE(ModalDialogHostObserver*)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ModalDialogHostObserver, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ModalDialogHostObserver,
kModalDialogHostObserverKey, kModalDialogHostObserverKey)
nullptr)
namespace constrained_window { namespace constrained_window {

2
components/exo/permission.cc

@@ -11,7 +11,7 @@ DEFINE_UI_CLASS_PROPERTY_TYPE(exo::Permission*)
namespace exo { namespace exo {
// Permission object allowing this window to activate itself. // Permission object allowing this window to activate itself.
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(exo::Permission, kPermissionKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(exo::Permission, kPermissionKey)
Permission::Permission(Permission::Capability capability) Permission::Permission(Permission::Capability capability)
: capability_(capability), expiry_(base::Time::Max()) {} : capability_(capability), expiry_(base::Time::Max()) {}

2
components/exo/shell_surface_util.cc

@@ -38,7 +38,7 @@ namespace {
DEFINE_UI_CLASS_PROPERTY_KEY(Surface*, kRootSurfaceKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(Surface*, kRootSurfaceKey, nullptr)
// Startup Id set by the client. // Startup Id set by the client.
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kStartupIdKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kStartupIdKey)
// A property key containing the client controlled shell surface. // A property key containing the client controlled shell surface.
DEFINE_UI_CLASS_PROPERTY_KEY(ClientControlledShellSurface*, DEFINE_UI_CLASS_PROPERTY_KEY(ClientControlledShellSurface*,

2
components/exo/surface.cc

@@ -341,7 +341,7 @@ void ImmediateExplicitRelease(
} // namespace } // namespace
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kClientSurfaceIdKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kClientSurfaceIdKey)
// A property key to store the window session Id set by client or full_restore // A property key to store the window session Id set by client or full_restore
// component. // component.

2
components/exo/test/shell_surface_builder.cc

@@ -87,7 +87,7 @@ namespace exo {
namespace test { namespace test {
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(Holder, kBuilderResourceHolderKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(Holder, kBuilderResourceHolderKey)
Holder* FindHolder(Surface* surface) { Holder* FindHolder(Surface* surface) {
aura::Window* window = surface->window(); aura::Window* window = surface->window();

2
components/exo/ui_lock_controller.cc

@@ -473,7 +473,7 @@ DEFINE_UI_CLASS_PROPERTY_TYPE(ExitNotifier*)
namespace exo { namespace exo {
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ExitNotifier, kExitNotifierKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ExitNotifier, kExitNotifierKey)
ExitNotifier* GetExitNotifier(UILockController* controller, ExitNotifier* GetExitNotifier(UILockController* controller,
aura::Window* window, aura::Window* window,

2
components/exo/window_properties.cc

@@ -8,7 +8,7 @@ DEFINE_UI_CLASS_PROPERTY_TYPE(exo::ProtectedNativePixmapQueryDelegate*)
namespace exo { namespace exo {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kApplicationIdKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kApplicationIdKey)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRestoreOrMaximizeExitsFullscreen, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kRestoreOrMaximizeExitsFullscreen, false)

2
ui/accessibility/aura/aura_window_properties.cc

@@ -12,7 +12,7 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(AX_EXPORT, ax::mojom::Role)
namespace ui { namespace ui {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kChildAXTreeID, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kChildAXTreeID)
DEFINE_UI_CLASS_PROPERTY_KEY(ax::mojom::Role, DEFINE_UI_CLASS_PROPERTY_KEY(ax::mojom::Role,
kAXRoleOverride, kAXRoleOverride,

24
ui/aura/client/aura_constants.cc

@@ -36,33 +36,31 @@ DEFINE_UI_CLASS_PROPERTY_KEY(bool,
false) false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kActivateOnPointerKey, true) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kActivateOnPointerKey, true)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kAnimationsDisabledKey, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAppIconKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::SizeF, kAspectRatio, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::SizeF, kAspectRatio)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAvatarIconKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kAvatarIconKey)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowLayerDrawn, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kWindowLayerDrawn, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kConstrainedWindowKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCreatedByUserGesture, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kCreatedByUserGesture, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kDrawAttentionKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(FocusClient*, kFocusClientKey, nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kHeadlessBoundsKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kHeadlessBoundsKey)
DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kHostWindowKey, nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kChildModalParentKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(Window*, kChildModalParentKey, nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::ModalType, DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::ModalType,
kModalKey, kModalKey,
ui::mojom::ModalType::kNone) ui::mojom::ModalType::kNone)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kNameKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ui::OwnedWindowAnchor, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ui::OwnedWindowAnchor, kOwnedWindowAnchor)
kOwnedWindowAnchor,
nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUseWindowBoundsForShadow, true) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUseWindowBoundsForShadow, true)
DEFINE_UI_CLASS_PROPERTY_KEY(gfx::NativeViewAccessible, DEFINE_UI_CLASS_PROPERTY_KEY(gfx::NativeViewAccessible,
kParentNativeViewAccessibleKey, kParentNativeViewAccessibleKey,
nullptr) nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kPreferredSize)
DEFINE_UI_CLASS_PROPERTY_KEY(int, kResizeBehaviorKey, kResizeBehaviorCanResize) DEFINE_UI_CLASS_PROPERTY_KEY(int, kResizeBehaviorKey, kResizeBehaviorCanResize)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsKey)
DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowShowState, DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowShowState,
kShowStateKey, kShowStateKey,
ui::mojom::WindowShowState::kDefault) ui::mojom::WindowShowState::kDefault)
@@ -75,14 +73,14 @@ DEFINE_UI_CLASS_PROPERTY_KEY(ui::mojom::WindowShowState,
DEFINE_UI_CLASS_PROPERTY_KEY(float, kRasterScale, 1.0f) DEFINE_UI_CLASS_PROPERTY_KEY(float, kRasterScale, 1.0f)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIsRestoringKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kIsRestoringKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSkipImeProcessing, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSkipImeProcessing, false)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::u16string, kTitleKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::u16string, kTitleKey)
DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0) DEFINE_UI_CLASS_PROPERTY_KEY(int, kTopViewInset, 0)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::ImageSkia, kWindowIconKey)
DEFINE_UI_CLASS_PROPERTY_KEY(int, kWindowCornerRadiusKey, -1) DEFINE_UI_CLASS_PROPERTY_KEY(int, kWindowCornerRadiusKey, -1)
DEFINE_UI_CLASS_PROPERTY_KEY(int, DEFINE_UI_CLASS_PROPERTY_KEY(int,
kWindowWorkspaceKey, kWindowWorkspaceKey,
kWindowWorkspaceUnassignedWorkspace) kWindowWorkspaceUnassignedWorkspace)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kDeskUuidKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kDeskUuidKey)
DEFINE_UI_CLASS_PROPERTY_KEY(ui::ZOrderLevel, DEFINE_UI_CLASS_PROPERTY_KEY(ui::ZOrderLevel,
kZOrderingKey, kZOrderingKey,
ui::ZOrderLevel::kNormal) ui::ZOrderLevel::kNormal)

3
ui/aura/window_unittest.cc

@@ -180,8 +180,7 @@ class DeletionTestProperty {
}; };
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DeletionTestProperty, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DeletionTestProperty,
kDeletionTestPropertyKey, kDeletionTestPropertyKey)
nullptr)
} // namespace } // namespace

28
ui/base/class_property.h

@@ -315,22 +315,22 @@ T* PropertyHandler::SetProperty(const ClassProperty<T*>* property,
#define DEFINE_CASCADING_UI_CLASS_PROPERTY_KEY(TYPE, NAME, DEFAULT) \ #define DEFINE_CASCADING_UI_CLASS_PROPERTY_KEY(TYPE, NAME, DEFAULT) \
DEFINE_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, DEFAULT, true) DEFINE_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, DEFAULT, true)
#define DEFINE_OWNED_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, DEFAULT, CASCADES) \ #define DEFINE_OWNED_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, CASCADES) \
static_assert(base::IsComplete<TYPE>); \ static_assert(base::IsComplete<TYPE>); \
static_assert(sizeof(TYPE*) <= sizeof(int64_t)); \ static_assert(sizeof(TYPE*) <= sizeof(int64_t)); \
namespace { \ namespace { \
void Deallocator##NAME(int64_t p) { \ void Deallocator##NAME(int64_t p) { \
delete ::ui::ClassPropertyCaster<TYPE*>::FromInt64(p); \ delete ::ui::ClassPropertyCaster<TYPE*>::FromInt64(p); \
} \ } \
constexpr ::ui::ClassProperty<TYPE*> NAME##_Value = { \ constexpr ::ui::ClassProperty<TYPE*> NAME##_Value = { \
DEFAULT, #NAME, CASCADES, &Deallocator##NAME}; \ nullptr, #NAME, CASCADES, &Deallocator##NAME}; \
} /* namespace */ \ } /* namespace */ \
constexpr const ::ui::ClassProperty<TYPE*>* NAME = &NAME##_Value; constexpr const ::ui::ClassProperty<TYPE*>* NAME = &NAME##_Value;
#define DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TYPE, NAME, DEFAULT) \ #define DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TYPE, NAME) \
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, DEFAULT, false) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, false)
#define DEFINE_CASCADING_OWNED_UI_CLASS_PROPERTY_KEY(TYPE, NAME, DEFAULT) \ #define DEFINE_CASCADING_OWNED_UI_CLASS_PROPERTY_KEY(TYPE, NAME) \
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, DEFAULT, true) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY_IMPL(TYPE, NAME, true)
#endif // UI_BASE_CLASS_PROPERTY_H_ #endif // UI_BASE_CLASS_PROPERTY_H_

9
ui/base/class_property_unittest.cc

@@ -75,13 +75,10 @@ class AssignableTestProperty {
bool was_move_assigned_ = false; bool was_move_assigned_ = false;
}; };
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TestProperty, kOwnedKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TestProperty, kOwnedKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(AssignableTestProperty, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(AssignableTestProperty, kAssignableKey)
kAssignableKey,
nullptr)
DEFINE_CASCADING_OWNED_UI_CLASS_PROPERTY_KEY(TestCascadingProperty, DEFINE_CASCADING_OWNED_UI_CLASS_PROPERTY_KEY(TestCascadingProperty,
kCascadingOwnedKey, kCascadingOwnedKey)
nullptr)
} // namespace } // namespace

4
ui/base/metadata/metadata_unittest.cc

@@ -116,8 +116,8 @@ class ClassPropertyMetaDataTestClass : public MetadataTestBaseClass {
struct MetadataTestClassNoMetadata : public MetadataTestBaseClass {}; struct MetadataTestClassNoMetadata : public MetadataTestBaseClass {};
DEFINE_UI_CLASS_PROPERTY_KEY(int, kIntKey, -1) DEFINE_UI_CLASS_PROPERTY_KEY(int, kIntKey, -1)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kOwnedInsetsKey1, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kOwnedInsetsKey1)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kOwnedInsetsKey2, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kOwnedInsetsKey2)
DEFINE_UI_CLASS_PROPERTY_KEY(gfx::Insets*, kInsetsKey1, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(gfx::Insets*, kInsetsKey1, nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(gfx::Insets*, kInsetsKey2, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(gfx::Insets*, kInsetsKey2, nullptr)
DEFINE_UI_CLASS_PROPERTY_TYPE(gfx::Insets*) DEFINE_UI_CLASS_PROPERTY_TYPE(gfx::Insets*)

2
ui/views/animation/ink_drop.cc

@@ -24,7 +24,7 @@ namespace views {
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(InkDropHost, kInkDropKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(InkDropHost, kInkDropKey)
// TODO(pbos): Remove this by changing the constructor parameters to // TODO(pbos): Remove this by changing the constructor parameters to
// InkDropImpl. // InkDropImpl.

3
ui/views/bubble/bubble_dialog_delegate_view.cc

@@ -83,8 +83,7 @@ namespace {
// last item is removed, the new last item, if available, is notified that it is // last item is removed, the new last item, if available, is notified that it is
// the new primary anchored bubble. // the new primary anchored bubble.
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::vector<views::BubbleDialogDelegate*>, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::vector<views::BubbleDialogDelegate*>,
kAnchorVector, kAnchorVector)
nullptr)
std::vector<BubbleDialogDelegate*>& GetAnchorVector(View* view) { std::vector<BubbleDialogDelegate*>& GetAnchorVector(View* view) {
if (!view->GetProperty(kAnchorVector)) { if (!view->GetProperty(kAnchorVector)) {

3
ui/views/cascading_property.cc

@@ -33,8 +33,7 @@ class CascadingColorProviderColor final : public CascadingProperty<SkColor> {
} // namespace } // namespace
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(CascadingProperty<SkColor>, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(CascadingProperty<SkColor>,
kCascadingBackgroundColor, kCascadingBackgroundColor)
nullptr)
void SetCascadingColorProviderColor( void SetCascadingColorProviderColor(
views::View* view, views::View* view,

3
ui/views/controls/label.cc

@@ -63,8 +63,7 @@ bool IsOpaque(SkColor color) {
namespace views { namespace views {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(CascadingProperty<SkColor>, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(CascadingProperty<SkColor>,
kCascadingLabelEnabledColor, kCascadingLabelEnabledColor)
nullptr)
Label::Label() : Label(std::u16string()) {} Label::Label() : Label(std::u16string()) {}

3
ui/views/controls/menu/menu_controller.cc

@@ -94,8 +94,7 @@ enum class MenuPartType { kNone, kMenuItem, kScrollUp, kScrollDown };
// attributes by MenuController::SetSelectionIndices() so that the controller // attributes by MenuController::SetSelectionIndices() so that the controller
// can update them if children change via MenuController::MenuChildrenChanged(). // can update them if children change via MenuController::MenuChildrenChanged().
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::vector<views::ViewTracker>, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::vector<views::ViewTracker>,
kOrderedMenuChildren, kOrderedMenuChildren)
nullptr)
#if BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_MAC)
bool AcceleratorShouldCancelMenu(const ui::Accelerator& accelerator) { bool AcceleratorShouldCancelMenu(const ui::Accelerator& accelerator) {

24
ui/views/view_class_properties.cc

@@ -31,27 +31,21 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, gfx::Size*)
namespace views { namespace views {
DEFINE_UI_CLASS_PROPERTY_KEY(int, kHitTestComponentKey, HTNOWHERE) DEFINE_UI_CLASS_PROPERTY_KEY(int, kHitTestComponentKey, HTNOWHERE)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kMarginsKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kMarginsKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kInternalPaddingKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kInternalPaddingKey)
DEFINE_UI_CLASS_PROPERTY_KEY(views::DialogDelegate*, DEFINE_UI_CLASS_PROPERTY_KEY(views::DialogDelegate*,
kAnchoredDialogKey, kAnchoredDialogKey,
nullptr) nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(views::Widget*, kWidgetForAnchoringKey, nullptr) DEFINE_UI_CLASS_PROPERTY_KEY(views::Widget*, kWidgetForAnchoringKey, nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(BoxLayoutFlexSpecification, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(BoxLayoutFlexSpecification,
kBoxLayoutFlexKey, kBoxLayoutFlexKey)
nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(views::HighlightPathGenerator, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(views::HighlightPathGenerator,
kHighlightPathGeneratorKey, kHighlightPathGeneratorKey)
nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(FlexSpecification, kFlexBehaviorKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(FlexSpecification, kFlexBehaviorKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayoutAlignment, kCrossAxisAlignmentKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayoutAlignment, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kTableColAndRowSpanKey)
kCrossAxisAlignmentKey, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayoutAlignment, kTableHorizAlignKey)
nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayoutAlignment, kTableVertAlignKey)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Size, kTableColAndRowSpanKey, nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayoutAlignment,
kTableHorizAlignKey,
nullptr)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(LayoutAlignment, kTableVertAlignKey, nullptr)
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kViewIgnoredByLayoutKey, false) DEFINE_UI_CLASS_PROPERTY_KEY(bool, kViewIgnoredByLayoutKey, false)
DEFINE_UI_CLASS_PROPERTY_KEY(ui::ElementIdentifier, DEFINE_UI_CLASS_PROPERTY_KEY(ui::ElementIdentifier,
kElementIdentifierKey, kElementIdentifierKey,

4
ui/views/view_utils.cc

@@ -16,9 +16,7 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, base::debug::StackTrace*)
namespace views { namespace views {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::debug::StackTrace, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(base::debug::StackTrace, kViewStackTraceKey)
kViewStackTraceKey,
nullptr)
namespace { namespace {

4
ui/wm/core/ime_util_chromeos.cc

@@ -54,9 +54,7 @@ void MoveWindowToEnsureCaretNotInRect(aura::Window* window,
} // namespace } // namespace
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kVirtualKeyboardRestoreBoundsKey)
kVirtualKeyboardRestoreBoundsKey,
nullptr)
void RestoreWindowBoundsOnClientFocusLost(aura::Window* window) { void RestoreWindowBoundsOnClientFocusLost(aura::Window* window) {
// Get restore bounds of the window // Get restore bounds of the window

2
ui/wm/core/shadow_controller.cc

@@ -30,7 +30,7 @@
using std::make_pair; using std::make_pair;
DEFINE_UI_CLASS_PROPERTY_TYPE(ui::Shadow*) DEFINE_UI_CLASS_PROPERTY_TYPE(ui::Shadow*)
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ui::Shadow, kShadowLayerKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(ui::Shadow, kShadowLayerKey)
namespace wm { namespace wm {

4
ui/wm/core/transient_window_manager.cc

@@ -30,9 +30,7 @@ namespace wm {
namespace { namespace {
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TransientWindowManager, DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(TransientWindowManager, kPropertyKey)
kPropertyKey,
nullptr)
// Returns true if the given `window` has a cycle in its transient window // Returns true if the given `window` has a cycle in its transient window
// hierarchy. // hierarchy.