Revert 86914 - Move a bunch of functions from Window onto Widget.

views/widget/native_widget_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 266 matching lines @@
 
 // static
 GtkWidget* NativeWidgetGtk::null_parent_ = NULL;
 bool NativeWidgetGtk::debug_paint_enabled_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetGtk, public:
 
 NativeWidgetGtk::NativeWidgetGtk(internal::NativeWidgetDelegate* delegate)
     : is_window_(false),
-      window_state_(GDK_WINDOW_STATE_WITHDRAWN),
       delegate_(delegate),
       widget_(NULL),
       window_contents_(NULL),
       child_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       transparent_(false),
       ignore_events_(false),
       ignore_drag_leave_(false),
       opacity_(255),
@@ skipping 412 matching lines @@
   g_signal_connect(window_contents_, "drag_drop",
                    G_CALLBACK(&OnDragDropThunk), this);
   g_signal_connect(window_contents_, "drag_leave",
                    G_CALLBACK(&OnDragLeaveThunk), this);
   g_signal_connect(window_contents_, "drag_data_get",
                    G_CALLBACK(&OnDragDataGetThunk), this);
   g_signal_connect(window_contents_, "drag_end",
                    G_CALLBACK(&OnDragEndThunk), this);
   g_signal_connect(window_contents_, "drag_failed",
                    G_CALLBACK(&OnDragFailedThunk), this);
-  g_signal_connect(G_OBJECT(GetNativeWindow()), "window-state-event",
-                   G_CALLBACK(&OnWindowStateEventThunk), this);
 
   tooltip_manager_.reset(new TooltipManagerGtk(this));
 
   // Register for tooltips.
   g_object_set(G_OBJECT(window_contents_), "has-tooltip", TRUE, NULL);
   g_signal_connect(window_contents_, "query_tooltip",
                    G_CALLBACK(&OnQueryTooltipThunk), this);
 
   if (child_) {
     if (parent)
@@ skipping 221 matching lines @@
 }
 
 void NativeWidgetGtk::Hide() {
   if (widget_) {
     gtk_widget_hide(widget_);
     if (widget_->window)
       gdk_window_lower(widget_->window);
   }
 }
 
-bool NativeWidgetGtk::IsVisible() const {
-  return GTK_WIDGET_VISIBLE(GetNativeView());
-}
-
-void NativeWidgetGtk::Activate() {
-  gtk_window_present(GetNativeWindow());
-}
-
-void NativeWidgetGtk::Deactivate() {
-  gdk_window_lower(GTK_WIDGET(GetNativeView())->window);
-}
-
-bool NativeWidgetGtk::IsActive() const {
-  DCHECK(!child_);
-  return is_active_;
+void NativeWidgetGtk::SetOpacity(unsigned char opacity) {
+  opacity_ = opacity;
+  if (widget_) {
+    // We can only set the opacity when the widget has been realized.
+    gdk_window_set_opacity(widget_->window, static_cast<gdouble>(opacity) /
+      static_cast<gdouble>(255));
+  }
 }
 
 void NativeWidgetGtk::SetAlwaysOnTop(bool on_top) {
   DCHECK(!child_);
   always_on_top_ = on_top;
   if (widget_)
     gtk_window_set_keep_above(GTK_WINDOW(widget_), on_top);
 }
 
-void NativeWidgetGtk::Maximize() {
-  gtk_window_maximize(GetNativeWindow());
+bool NativeWidgetGtk::IsVisible() const {
+  return GTK_WIDGET_VISIBLE(widget_);
 }
 
-void NativeWidgetGtk::Minimize() {
-  gtk_window_iconify(GetNativeWindow());
-}
-
-bool NativeWidgetGtk::IsMaximized() const {
-  return window_state_ & GDK_WINDOW_STATE_MAXIMIZED;
-}
-
-bool NativeWidgetGtk::IsMinimized() const {
-  return window_state_ & GDK_WINDOW_STATE_ICONIFIED;
-}
-
-void NativeWidgetGtk::Restore() {
-  if (IsMaximized())
-    gtk_window_unmaximize(GetNativeWindow());
-  else if (IsMinimized())
-    gtk_window_deiconify(GetNativeWindow());
-}
-
-void NativeWidgetGtk::SetOpacity(unsigned char opacity) {
-  opacity_ = opacity;
-  if (widget_) {
-    // We can only set the opacity when the widget has been realized.
-    gdk_window_set_opacity(widget_->window, static_cast<gdouble>(opacity) /
-        static_cast<gdouble>(255));
-  }
+bool NativeWidgetGtk::IsActive() const {
+  DCHECK(!child_);
+  return is_active_;
 }
 
 bool NativeWidgetGtk::IsAccessibleWidget() const {
   return false;
 }
 
 bool NativeWidgetGtk::ContainsNativeView(gfx::NativeView native_view) const {
   // TODO(port)  See implementation in NativeWidgetWin::ContainsNativeView.
   NOTREACHED() << "NativeWidgetGtk::ContainsNativeView is not implemented.";
   return false;
@@ skipping 361 matching lines @@
   // a bug in message_pump_glib_x.cc as we do get X Expose event but
   // it doesn't trigger gtk's expose signal. We're not going to fix this
   // as we're removing gtk and migrating to new compositor.
   gdk_window_process_all_updates();
 #endif
 }
 
 void NativeWidgetGtk::OnHide(GtkWidget* widget) {
 }
 
-gboolean NativeWidgetGtk::OnWindowStateEvent(GtkWidget* widget,
-                                             GdkEventWindowState* event) {
-  window_state_ = event->new_window_state;
-  return FALSE;
-}
-
 void NativeWidgetGtk::HandleXGrabBroke() {
 }
 
 void NativeWidgetGtk::HandleGtkGrabBroke() {
   delegate_->OnMouseCaptureLost();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetGtk, private:
 
@@ skipping 432 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views