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

Side by Side Diff: ui/views/widget/native_widget_gtk.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_GTK_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE; 186 virtual gfx::Rect GetWindowScreenBounds() const OVERRIDE;
187 virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE; 187 virtual gfx::Rect GetClientAreaScreenBounds() const OVERRIDE;
188 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 188 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
189 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 189 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
190 virtual void SetSize(const gfx::Size& size) OVERRIDE; 190 virtual void SetSize(const gfx::Size& size) OVERRIDE;
191 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE; 191 virtual void StackAbove(gfx::NativeView native_view) OVERRIDE;
192 virtual void StackAtTop() OVERRIDE; 192 virtual void StackAtTop() OVERRIDE;
193 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE; 193 virtual void SetShape(gfx::NativeRegion shape) OVERRIDE;
194 virtual void Close() OVERRIDE; 194 virtual void Close() OVERRIDE;
195 virtual void CloseNow() OVERRIDE; 195 virtual void CloseNow() OVERRIDE;
196 virtual void EnableClose(bool enable) OVERRIDE;
196 virtual void Show() OVERRIDE; 197 virtual void Show() OVERRIDE;
197 virtual void Hide() OVERRIDE; 198 virtual void Hide() OVERRIDE;
198 virtual void ShowMaximizedWithBounds( 199 virtual void ShowMaximizedWithBounds(
199 const gfx::Rect& restored_bounds) OVERRIDE; 200 const gfx::Rect& restored_bounds) OVERRIDE;
200 virtual void ShowWithWindowState(ui::WindowShowState window_state) OVERRIDE; 201 virtual void ShowWithWindowState(ui::WindowShowState window_state) OVERRIDE;
201 virtual bool IsVisible() const OVERRIDE; 202 virtual bool IsVisible() const OVERRIDE;
202 virtual void Activate() OVERRIDE; 203 virtual void Activate() OVERRIDE;
203 virtual void Deactivate() OVERRIDE; 204 virtual void Deactivate() OVERRIDE;
204 virtual bool IsActive() const OVERRIDE; 205 virtual bool IsActive() const OVERRIDE;
205 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; 206 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 bool is_menu_; 467 bool is_menu_;
467 468
468 scoped_ptr<ui::GtkSignalRegistrar> signal_registrar_; 469 scoped_ptr<ui::GtkSignalRegistrar> signal_registrar_;
469 470
470 DISALLOW_COPY_AND_ASSIGN(NativeWidgetGtk); 471 DISALLOW_COPY_AND_ASSIGN(NativeWidgetGtk);
471 }; 472 };
472 473
473 } // namespace views 474 } // namespace views
474 475
475 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_ 476 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698