Refactors HWNDView, NativeViewHostGtk and NativeViewHost so that they match t...

views/controls/native/native_view_host_gtk.cc

Index: views/controls/native/native_view_host_gtk.cc
===================================================================
--- views/controls/native/native_view_host_gtk.cc	(revision 0)
+++ views/controls/native/native_view_host_gtk.cc	(working copy)
@@ -2,17 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/controls/native_view_host_gtk.h"
+#include "views/controls/native/native_view_host_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
+#include "views/controls/native/native_view_host.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
 
-NativeViewHostGtk::NativeViewHostGtk()
-    : NativeViewHost(),
+////////////////////////////////////////////////////////////////////////////////
+// NativeViewHostGtk, public:
+
+NativeViewHostWin::NativeViewHostWin(NativeViewHost* host)
+    : host_(host),
+      installed_clip_(false),
       destroy_signal_id_(0) {
 }
 
@@ -30,81 +35,77 @@
   g_object_set_data(G_OBJECT(widget), "chrome-view", view);
 }
 
-void NativeViewHostGtk::Attach(GtkWidget* widget) {
-  DCHECK(native_view() == NULL);
-  DCHECK(widget);
+////////////////////////////////////////////////////////////////////////////////
+// NativeViewHostGtk, NativeViewHostWrapper implementation:
 
+void NativeViewHostGtk::NativeViewAttached() {
+  DCHECK(host_->native_view());
+
   // Adds a mapping between the GtkWidget and us.
-  SetViewForNative(widget, this);
+  SetViewForNative(host_->native_view(), host_);
 
-  destroy_signal_id_ = g_signal_connect(G_OBJECT(widget), "destroy",
-                                        G_CALLBACK(CallDestroy), NULL);
+  destroy_signal_id_ = g_signal_connect(G_OBJECT(host_->native_view()),
+                                        "destroy", G_CALLBACK(CallDestroy),
+                                        NULL);
 
-  set_native_view(widget);
-
   // First hide the new window. We don't want anything to draw (like sub-hwnd
   // borders), when we change the parent below.
-  gtk_widget_hide(widget);
+  gtk_widget_hide(host_->native_view());
 
   // Set the parent.
-  static_cast<WidgetGtk*>(GetWidget())->AddChild(widget);
-  Layout();
+  static_cast<WidgetGtk*>(host_->GetWidget())->AddChild(host_->native_view());
+  host_->Layout();
 
-  // TODO: figure out focus.
+  // TODO(port): figure out focus.
   // FocusManager::InstallFocusSubclass(
   // hwnd, associated_focus_view()_ ? associated_focus_view() : this);
 }
 
-void NativeViewHostGtk::Detach() {
-  DCHECK(native_view());
+void NativeViewHostGtk::NativeViewDetaching() {
+  DCHECK(host_->native_view());
 
-  g_signal_handler_disconnect(G_OBJECT(native_view()), destroy_signal_id_);
+  g_signal_handler_disconnect(G_OBJECT(host_->native_view()),
+                              destroy_signal_id_);
   destroy_signal_id_ = 0;
 
-  // TODO: focus.
+  // TODO(port): focus.
   // FocusManager::UninstallFocusSubclass(native_view());
-  set_native_view(NULL);
-  set_installed_clip(false);
+  installed_clip_ = false;
 }
 
-void NativeViewHostGtk::ViewHierarchyChanged(bool is_add, View* parent,
-                                             View* child) {
-  if (!native_view())
-    return;
-
-  WidgetGtk* parent_widget = static_cast<WidgetGtk*>(GetWidget());
-  if (is_add && parent_widget) {
-    GtkWidget* widget_parent = gtk_widget_get_parent(native_view());
-    GtkWidget* parent_widget_widget = parent_widget->child_widget_parent();
-    if (widget_parent != parent_widget_widget) {
-      g_object_ref(native_view());
-      if (widget_parent)
-        gtk_container_remove(GTK_CONTAINER(widget_parent), native_view());
-      gtk_container_add(GTK_CONTAINER(parent_widget_widget), native_view());
-      g_object_unref(native_view());
-    }
-    if (IsVisibleInRootView())
-      gtk_widget_show(native_view());
-    else
-      gtk_widget_hide(native_view());
-    Layout();
-  } else if (!is_add) {
-    gtk_widget_hide(native_view());
-    if (parent_widget) {
-      gtk_container_remove(GTK_CONTAINER(parent_widget->child_widget_parent()),
-                           native_view());
-    }
+void NativeViewHostGtk::AddedToWidget() {
+  WidgetGtk* parent_widget = static_cast<WidgetGtk*>(host_->GetWidget());
+  GtkWidget* widget_parent = gtk_widget_get_parent(host_->native_view());
+  GtkWidget* parent_widget_widget = parent_widget->child_widget_parent();
+  if (widget_parent != parent_widget_widget) {
+    g_object_ref(host_->native_view());
+    if (widget_parent)
+      gtk_container_remove(GTK_CONTAINER(widget_parent), host_->native_view());
+    gtk_container_add(GTK_CONTAINER(parent_widget_widget),
+                      host_->native_view());
+    g_object_unref(host_->native_view());
   }
+  if (host_->IsVisibleInRootView())
+    gtk_widget_show(host_->native_view());
+  else
+    gtk_widget_hide(host_->native_view());
+  host_->Layout();
 }
 
-void NativeViewHostGtk::Focus() {
-  NOTIMPLEMENTED();
+void NativeViewHostGtk::RemovedFromWidget() {
+  WidgetGtk* parent_widget = static_cast<WidgetGtk*>(host_->GetWidget());
+  gtk_widget_hide(host_->native_view());
+  if (parent_widget) {
+    gtk_container_remove(GTK_CONTAINER(parent_widget->child_widget_parent()),
+                         host_->native_view());
+  }
 }
 
 void NativeViewHostGtk::InstallClip(int x, int y, int w, int h) {
   DCHECK(w > 0 && h > 0);
 
-  bool has_window = (GTK_WIDGET_FLAGS(native_view()) & GTK_NO_WINDOW) == 0;
+  bool has_window =
+      (GTK_WIDGET_FLAGS(host_->native_view()) & GTK_NO_WINDOW) == 0;
   if (!has_window) {
     // Clip is only supported on GtkWidgets that have windows. If this becomes
     // an issue (as it may be in the options dialog) we'll need to wrap the
@@ -116,42 +117,57 @@
   }
   DCHECK(has_window);
   // Unset the current region.
-  gdk_window_shape_combine_region(native_view()->window, NULL, 0, 0);
+  gdk_window_shape_combine_region(host_->native_view()->window, NULL, 0, 0);
 
   // Set a new region.
   // TODO: using shapes is a bit expensive. Should investigated if there is
   // another more efficient way to accomplish this.
   GdkRectangle clip_rect = { x, y, w, h };
   GdkRegion* clip_region = gdk_region_rectangle(&clip_rect);
-  gdk_window_shape_combine_region(native_view()->window, clip_region, x, y);
+  gdk_window_shape_combine_region(host_->native_view()->window, clip_region, x,
+                                  y);
   gdk_region_destroy(clip_region);
+  installed_clip_ = true;
 }
 
 void NativeViewHostGtk::UninstallClip() {
-  gtk_widget_shape_combine_mask(native_view(), NULL, 0, 0);
+  gtk_widget_shape_combine_mask(host_->native_view(), NULL, 0, 0);
+  installed_clip_ = false;
 }
 
 void NativeViewHostGtk::ShowWidget(int x, int y, int w, int h) {
-  WidgetGtk* parent = static_cast<WidgetGtk*>(GetWidget());
-  parent->PositionChild(native_view(), x, y, w, h);
-  gtk_widget_show(native_view());
+  WidgetGtk* parent = static_cast<WidgetGtk*>(host_->GetWidget());
+  parent->PositionChild(host_->native_view(), x, y, w, h);
+  gtk_widget_show(host_->native_view());
 }
 
 void NativeViewHostGtk::HideWidget() {
-  gtk_widget_hide(native_view());
+  gtk_widget_hide(host_->native_view());
 }
 
-void NativeViewHostGtk::OnDestroy() {
-  set_native_view(NULL);
+void NativeViewHostGtk::SetFocus() {
+  NOTIMPLEMENTED();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeViewHostGtk, private:
+
 // static
 void NativeViewHostGtk::CallDestroy(GtkObject* object) {
   View* view = GetViewForNative(GTK_WIDGET(object));
   if (!view)
     return;
 
-  return static_cast<NativeViewHostGtk*>(view)->OnDestroy();
+  return static_cast<NativeViewHost*>(view)->NativeViewDestroyed();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeViewHostWrapper, public:
+
+// static
+NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
+    NativeViewHost* host) {
+  return new NativeViewHostGtk(host);
+}
+
 }  // namespace views