ui/views/widget/native_widget_aura.h - Issue 13699002: add HideAndClose in preference to having Close sometimes magically defer

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

Issue 13699002: add HideAndClose in preference to having Close sometimes magically defer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: non aura Created 7 years, 8 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 | Annotate | Revision Log

« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_x11.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

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 "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

9 #include "base/memory/weak_ptr.h"	9 #include "base/memory/weak_ptr.h"

10 #include "ui/aura/client/activation_change_observer.h"	10 #include "ui/aura/client/activation_change_observer.h"

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;	82 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;

83 virtual void SetSize(const gfx::Size& size) OVERRIDE;	83 virtual void SetSize(const gfx::Size& size) OVERRIDE;

84 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;	84 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;

85 virtual void StackAtTop() OVERRIDE;	85 virtual void StackAtTop() OVERRIDE;

86 virtual void StackBelow(gfx::NativeView native_view) OVERRIDE;	86 virtual void StackBelow(gfx::NativeView native_view) OVERRIDE;

87 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;	87 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;

88 virtual void Close() OVERRIDE;	88 virtual void Close() OVERRIDE;

89 virtual void CloseNow() OVERRIDE;	89 virtual void CloseNow() OVERRIDE;

90 virtual void Show() OVERRIDE;	90 virtual void Show() OVERRIDE;

91 virtual void Hide() OVERRIDE;	91 virtual void Hide() OVERRIDE;

	92 virtual void HideAndClose() OVERRIDE;

92 virtual void ShowMaximizedWithBounds(	93 virtual void ShowMaximizedWithBounds(

93 const gfx::Rect& restored_bounds) OVERRIDE;	94 const gfx::Rect& restored_bounds) OVERRIDE;

94 virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE;	95 virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE;

95 virtual bool IsVisible() const OVERRIDE;	96 virtual bool IsVisible() const OVERRIDE;

96 virtual void Activate() OVERRIDE;	97 virtual void Activate() OVERRIDE;

97 virtual void Deactivate() OVERRIDE;	98 virtual void Deactivate() OVERRIDE;

98 virtual bool IsActive() const OVERRIDE;	99 virtual bool IsActive() const OVERRIDE;

99 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;	100 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;

100 virtual void Maximize() OVERRIDE;	101 virtual void Maximize() OVERRIDE;

101 virtual void Minimize() OVERRIDE;	102 virtual void Minimize() OVERRIDE;

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
210	211

211 scoped_ptr<DropHelper> drop_helper_;	212 scoped_ptr<DropHelper> drop_helper_;

212 int last_drop_operation_;	213 int last_drop_operation_;

213	214

214 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);	215 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);

215 };	216 };

216	217

217 } // namespace views	218 } // namespace views

218	219

219 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	220 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

OLD	NEW