Fix linux autocomplete popups.

BUG=http://crbug.com/12059

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

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

2 files changed, 2 insertions, 13 deletions

diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 6efcd03..8419553 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -167,7 +167,6 @@ RenderWidgetHostViewGtk::RenderWidgetHostViewGtk(RenderWidgetHost* widget_host)
       parent_host_view_(NULL),
       parent_(NULL),
       popup_signal_id_(0),
-      activatable_(true),
       about_to_validate_and_paint_(false),
       is_loading_(false),
       is_hidden_(false) {
@@ -193,7 +192,7 @@ void RenderWidgetHostViewGtk::InitAsPopup(
 
   // If we are not activatable, we don't want to grab keyboard input,
   // and webkit will manage our destruction.
-  if (activatable_) {
+  if (activatable()) {
     // Grab all input for the app. If a click lands outside the bounds of the
     // popup, WebKit will notice and destroy us.
     gtk_grab_add(view_.get());
@@ -333,7 +332,7 @@ void RenderWidgetHostViewGtk::Destroy() {
   // If |parent_| is non-null, we are a popup and we must disconnect from our
   // parent and destroy the popup window.
   if (parent_) {
-    if (activatable_) {
+    if (activatable()) {
       g_signal_handler_disconnect(parent_, popup_signal_id_);
       parent_host_view_->Focus();
     }
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index a0da6f9..dba9ce1 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -30,10 +30,6 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   // Initialize this object for use as a drawing area.
   void InitAsChild();
 
-  // TODO(estade): unfork this with RenderWidgetHostViewWin function of same
-  // name.
-  void set_activatable(bool activatable) { activatable_ = activatable; }
-
   // ---------------------------------------------------------------------------
   // Implementation of RenderWidgetHostView...
 
@@ -95,12 +91,6 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   // We connect to the parent's focus out event. When we are destroyed, we need
   // to remove this handler, so we must keep track of its id.
   gulong popup_signal_id_;
-  // This variable determines our degree of control over user input. If we are
-  // activatable, we must grab and handle all user input. If we are not
-  // activatable, then our parent render view retains more control. Example of
-  // activatable popup: <select> dropdown. Example of non-activatable popup:
-  // form autocomplete.
-  bool activatable_;
   // This is true when we are currently painting and thus should handle extra
   // paint requests by expanding the invalid rect rather than actually
   // painting.