ui/views/widget/native_widget_aura.h - Issue 2173033002: Make various views SetShape() methods take an unique_ptr.

Side by Side Diff: ui/views/widget/native_widget_aura.h

Issue 2173033002: Make various views SetShape() methods take an unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits Created 4 years, 4 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

OLD	NEW
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_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/macros.h"	10 #include "base/macros.h"

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 void InitModalType(ui::ModalType modal_type) override;	82 void InitModalType(ui::ModalType modal_type) override;

83 gfx::Rect GetWindowBoundsInScreen() const override;	83 gfx::Rect GetWindowBoundsInScreen() const override;

84 gfx::Rect GetClientAreaBoundsInScreen() const override;	84 gfx::Rect GetClientAreaBoundsInScreen() const override;

85 gfx::Rect GetRestoredBounds() const override;	85 gfx::Rect GetRestoredBounds() const override;

86 std::string GetWorkspace() const override;	86 std::string GetWorkspace() const override;

87 void SetBounds(const gfx::Rect& bounds) override;	87 void SetBounds(const gfx::Rect& bounds) override;

88 void SetSize(const gfx::Size& size) override;	88 void SetSize(const gfx::Size& size) override;

89 void StackAbove(gfx::NativeView native_view) override;	89 void StackAbove(gfx::NativeView native_view) override;

90 void StackAtTop() override;	90 void StackAtTop() override;

91 void StackBelow(gfx::NativeView native_view) override;	91 void StackBelow(gfx::NativeView native_view) override;

92 void SetShape(SkRegion* shape) override;	92 void SetShape(std::unique_ptr<SkRegion> shape) override;

93 void Close() override;	93 void Close() override;

94 void CloseNow() override;	94 void CloseNow() override;

95 void Show() override;	95 void Show() override;

96 void Hide() override;	96 void Hide() override;

97 void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) override;	97 void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) override;

98 void ShowWithWindowState(ui::WindowShowState state) override;	98 void ShowWithWindowState(ui::WindowShowState state) override;

99 bool IsVisible() const override;	99 bool IsVisible() const override;

100 void Activate() override;	100 void Activate() override;

101 void Deactivate() override;	101 void Deactivate() override;

102 bool IsActive() const override;	102 bool IsActive() const override;

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 // The following factory is used for calls to close the NativeWidgetAura	230 // The following factory is used for calls to close the NativeWidgetAura

231 // instance.	231 // instance.

232 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;	232 base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;

233	233

234 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);	234 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);

235 };	235 };

236	236

237 } // namespace views	237 } // namespace views

238	238

239 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	239 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

OLD	NEW