Reverting 27113.

views/controls/native/native_view_host_gtk.cc

 // Copyright (c) 2009 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/controls/native/native_view_host_gtk.h"
 
 #include <gtk/gtk.h>
 #include <algorithm>
 
 #include "base/logging.h"
@@ skipping 30 matching lines @@
   else
     gtk_container_add(GTK_CONTAINER(fixed_), host_->native_view());
 
   if (!destroy_signal_id_) {
     destroy_signal_id_ = g_signal_connect(G_OBJECT(host_->native_view()),
                                           "destroy", G_CALLBACK(CallDestroy),
                                           this);
   }
 
   if (!focus_signal_id_) {
-    focus_signal_id_ = g_signal_connect(G_OBJECT(host_->focus_native_view()),
+    focus_signal_id_ = g_signal_connect(G_OBJECT(host_->native_view()),
                                         "focus-in-event",
                                         G_CALLBACK(CallFocusIn), this);
   }
 
   // Always layout though.
   host_->Layout();
 
   // We own the native view as long as it's attached, so that we can safely
   // reparent it in multiple passes.
   gtk_widget_ref(host_->native_view());
 
   // TODO(port): figure out focus.
 }
 
 void NativeViewHostGtk::NativeViewDetaching() {
   DCHECK(host_->native_view());
 
   g_signal_handler_disconnect(G_OBJECT(host_->native_view()),
                               destroy_signal_id_);
   destroy_signal_id_ = 0;
 
-  g_signal_handler_disconnect(G_OBJECT(host_->focus_native_view()),
+  g_signal_handler_disconnect(G_OBJECT(host_->native_view()),
                               focus_signal_id_);
   focus_signal_id_ = 0;
 
   installed_clip_ = false;
 
   // Release ownership back to the caller.
   gtk_widget_unref(host_->native_view());
 }
 
 void NativeViewHostGtk::AddedToWidget() {
@@ skipping 73 matching lines @@
   gtk_fixed_move(GTK_FIXED(fixed_), host_->native_view(), child_x, child_y);
 
   gtk_widget_show(fixed_);
   gtk_widget_show(host_->native_view());
 }
 
 void NativeViewHostGtk::HideWidget() {
   gtk_widget_hide(fixed_);
 }
 
+void NativeViewHostGtk::SetFocus() {
+  DCHECK(host_->native_view());
+  gtk_widget_grab_focus(host_->native_view());
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostGtk, private:
 
 void NativeViewHostGtk::CreateFixed(bool needs_window) {
   DestroyFixed();
 
   fixed_ = gtk_fixed_new();
   gtk_fixed_set_has_window(GTK_FIXED(fixed_), needs_window);
   // Defeat refcounting. We need to own the fixed.
   gtk_widget_ref(fixed_);
@@ skipping 26 matching lines @@
   return static_cast<WidgetGtk*>(host_->GetWidget());
 }
 
 // static
 void NativeViewHostGtk::CallDestroy(GtkObject* object,
                                     NativeViewHostGtk* host) {
   host->host_->NativeViewDestroyed();
 }
 
 // static
-gboolean NativeViewHostGtk::CallFocusIn(GtkWidget* widget,
-                                        GdkEventFocus* event,
-                                        NativeViewHostGtk* host) {
-  host->host_->GotNativeFocus();
-  return false;
+void NativeViewHostGtk::CallFocusIn(GtkWidget* widget,
+                                    GdkEventFocus* event,
+                                    NativeViewHostGtk* host) {
+  FocusManager* focus_manager =
+      FocusManager::GetFocusManagerForNativeView(widget);
+  if (!focus_manager) {
+    // TODO(jcampan): http://crbug.com/21378 Reenable this NOTREACHED() when the
+    // options page is only based on views.
+    // NOTREACHED();
+    NOTIMPLEMENTED();
+    return;
+  }
+  focus_manager->SetFocusedView(host->host_->focus_view());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWrapper, public:
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostGtk(host);
 }
 
 }  // namespace views