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

Unified Diff: views/widget/native_widget_gtk.h

Issue 6976040: Revert 86914 - Move a bunch of functions from Window onto Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/native_widget.h ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/native_widget_gtk.h
===================================================================
--- views/widget/native_widget_gtk.h (revision 86938)
+++ views/widget/native_widget_gtk.h (working copy)
@@ -178,17 +178,10 @@
virtual void CloseNow() OVERRIDE;
virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE;
+ virtual void SetOpacity(unsigned char opacity) OVERRIDE;
+ virtual void SetAlwaysOnTop(bool on_top) OVERRIDE;
virtual bool IsVisible() const OVERRIDE;
- virtual void Activate() OVERRIDE;
- virtual void Deactivate() OVERRIDE;
virtual bool IsActive() const OVERRIDE;
- virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
- virtual void Maximize() OVERRIDE;
- virtual void Minimize() OVERRIDE;
- virtual bool IsMaximized() const OVERRIDE;
- virtual bool IsMinimized() const OVERRIDE;
- virtual void Restore() OVERRIDE;
- virtual void SetOpacity(unsigned char opacity) OVERRIDE;
virtual bool IsAccessibleWidget() const OVERRIDE;
virtual bool ContainsNativeView(gfx::NativeView native_view) const OVERRIDE;
virtual void RunShellDrag(View* view,
@@ -252,8 +245,6 @@
CHROMEGTK_CALLBACK_0(NativeWidgetGtk, void, OnShow);
CHROMEGTK_CALLBACK_0(NativeWidgetGtk, void, OnMap);
CHROMEGTK_CALLBACK_0(NativeWidgetGtk, void, OnHide);
- CHROMEGTK_CALLBACK_1(NativeWidgetGtk, gboolean, OnWindowStateEvent,
- GdkEventWindowState*);
// Invoked when gtk grab is stolen by other GtkWidget in the same
// application.
@@ -266,10 +257,6 @@
// Are we a subclass of NativeWindowGtk?
bool is_window_;
- // State of the window, such as fullscreen, hidden...
- // TODO(beng): move to private once NativeWindowGtk no longer refers to it.
- GdkWindowState window_state_;
-
private:
class DropObserver;
friend class DropObserver;
« no previous file with comments | « views/widget/native_widget.h ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698