ui/views/widget/native_widget_aura.h - Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th...

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

Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years 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

« content/browser/gamepad/data_fetcher_win.cc ('K') | « ui/views/test/views_test_base.h ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #pragma once	7 #pragma once

8	8

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

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

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE;	80 virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE;

81 virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE;	81 virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE;

82 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;	82 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;

83 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;	83 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;

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

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

86 virtual void StackAtTop() OVERRIDE;	86 virtual void StackAtTop() 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 EnableClose(bool enable) OVERRIDE;

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

91 virtual void Hide() OVERRIDE;	92 virtual void Hide() 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;

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 scoped_ptr<RootWindowObserverImpl> root_window_observer_;	175 scoped_ptr<RootWindowObserverImpl> root_window_observer_;

175	176

176 scoped_ptr<DropHelper> drop_helper_;	177 scoped_ptr<DropHelper> drop_helper_;

177	178

178 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);	179 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);

179 };	180 };

180	181

181 } // namespace views	182 } // namespace views

182	183

183 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_	184 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_

OLD	NEW