[Linux Views] Handle focus in event of native views and controls correctly.

BUG=http://crosbug.com/1800
TEST=Build chromium with toolkit_views=1, and run it with ibus input method, then try if the input method can be enabled inside find bar.

Review URL: http://codereview.chromium.org/1547027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44260 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc
index 6857d48..3b0325c 100644
--- a/views/controls/native_control_gtk.cc
+++ b/views/controls/native_control_gtk.cc
@@ -1,6 +1,6 @@
-// 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.
+// Copyright (c) 2010 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_control_gtk.h"
 
@@ -80,9 +80,9 @@ void NativeControlGtk::NativeControlCreated(GtkWidget* native_control) {
 }
 
 // static
-void NativeControlGtk::CallFocusIn(GtkWidget* widget,
-                                   GdkEventFocus* event,
-                                   NativeControlGtk* control) {
+gboolean NativeControlGtk::CallFocusIn(GtkWidget* widget,
+                                       GdkEventFocus* event,
+                                       NativeControlGtk* control) {
   FocusManager* focus_manager =
       FocusManager::GetFocusManagerForNativeView(widget);
   if (!focus_manager) {
@@ -90,9 +90,10 @@ void NativeControlGtk::CallFocusIn(GtkWidget* widget,
     // options page is only based on views.
     // NOTREACHED();
     NOTIMPLEMENTED();
-    return;
+    return false;
   }
   focus_manager->SetFocusedView(control->focus_view());
+  return false;
 }
 
 }  // namespace views