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

Side by Side Diff: ui/views/widget/native_widget_win.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
OLDNEW
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_WIN_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <atlbase.h> 9 #include <atlbase.h>
10 #include <atlapp.h> 10 #include <atlapp.h>
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE; 218 virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE;
219 virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE; 219 virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE;
220 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 220 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
221 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 221 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
222 virtual void SetSize(const gfx::Size& size) OVERRIDE; 222 virtual void SetSize(const gfx::Size& size) OVERRIDE;
223 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE; 223 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;
224 virtual void StackAtTop() OVERRIDE; 224 virtual void StackAtTop() OVERRIDE;
225 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE; 225 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;
226 virtual void Close() OVERRIDE; 226 virtual void Close() OVERRIDE;
227 virtual void CloseNow() OVERRIDE; 227 virtual void CloseNow() OVERRIDE;
228 virtual void EnableClose(bool enable) OVERRIDE;
228 virtual void Show() OVERRIDE; 229 virtual void Show() OVERRIDE;
229 virtual void Hide() OVERRIDE; 230 virtual void Hide() OVERRIDE;
230 virtual void ShowMaximizedWithBounds( 231 virtual void ShowMaximizedWithBounds(
231 const gfx::Rect& restored_bounds) OVERRIDE; 232 const gfx::Rect& restored_bounds) OVERRIDE;
232 virtual void ShowWithWindowState(ui::WindowShowState show_state) OVERRIDE; 233 virtual void ShowWithWindowState(ui::WindowShowState show_state) OVERRIDE;
233 virtual bool IsVisible() const OVERRIDE; 234 virtual bool IsVisible() const OVERRIDE;
234 virtual void Activate() OVERRIDE; 235 virtual void Activate() OVERRIDE;
235 virtual void Deactivate() OVERRIDE; 236 virtual void Deactivate() OVERRIDE;
236 virtual bool IsActive() const OVERRIDE; 237 virtual bool IsActive() const OVERRIDE;
237 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; 238 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 // rather than asking the Widget for the non_client_view so that we know at 651 // rather than asking the Widget for the non_client_view so that we know at
651 // Init time, before the Widget has created the NonClientView. 652 // Init time, before the Widget has created the NonClientView.
652 bool has_non_client_view_; 653 bool has_non_client_view_;
653 654
654 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin); 655 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
655 }; 656 };
656 657
657 } // namespace views 658 } // namespace views
658 659
659 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 660 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698