Revert of Close the select box when the parent RWHVA loses focus

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 369 matching lines @@
       event->type() != ui::ET_TOUCH_PRESSED) {
     return;
   }
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (target != window_ &&
       (!popup_parent_host_view_ ||
        target != popup_parent_host_view_->window_)) {
     // Note: popup_parent_host_view_ may be NULL when there are multiple
     // popup children per view. See: RenderWidgetHostViewAura::InitAsPopup().
-    Shutdown();
+    in_shutdown_ = true;
+    host_->Shutdown();
   }
 }
 
 // We have to implement the WindowObserver interface on a separate object
 // because clang doesn't like implementing multiple interfaces that have
 // methods with the same name. This object is owned by the
 // RenderWidgetHostViewAura.
 class RenderWidgetHostViewAura::WindowObserver : public aura::WindowObserver {
  public:
   explicit WindowObserver(RenderWidgetHostViewAura* view)
@@ skipping 1410 matching lines @@
         aura::WindowTracker tracker;
         aura::Window* window = window_;
         tracker.Add(window);
         host->Focus();
         if (!tracker.Contains(window)) {
           event->SetHandled();
           return;
         }
       }
     }
-    Shutdown();
+    if (!in_shutdown_) {
+      in_shutdown_ = true;
+      host_->Shutdown();
+    }
   } else {
     if (event->key_code() == ui::VKEY_RETURN) {
       // Do not forward return key release events if no press event was handled.
       if (event->type() == ui::ET_KEY_RELEASED && !accept_return_character_)
         return;
       // Accept return key character events between press and release events.
       accept_return_character_ = event->type() == ui::ET_KEY_PRESSED;
     }
 
     // We don't have to communicate with an input method here.
@@ skipping 369 matching lines @@
       // On Windows, if we are switching to a non Aura Window on a different
       // screen we should not close the fullscreen window.
       if (!gained_focus) {
         POINT point = {0};
         ::GetCursorPos(&point);
         if (screen->GetDisplayNearestWindow(window_).id() !=
             screen->GetDisplayNearestPoint(gfx::Point(point)).id())
           return;
       }
 #endif
-      Shutdown();
-      return;
+      in_shutdown_ = true;
+      host_->Shutdown();
     }
-
-    // Close the child popup window if we lose focus (e.g. due to a JS alert or
-    // system modal dialog). This is particularly important if
-    // |popup_child_host_view_| has mouse capture.
-    if (popup_child_host_view_)
-      popup_child_host_view_->Shutdown();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, aura::WindowTreeHostObserver implementation:
 
 void RenderWidgetHostViewAura::OnHostMoved(const aura::WindowTreeHost* host,
                                            const gfx::Point& new_origin) {
   TRACE_EVENT1("ui", "RenderWidgetHostViewAura::OnHostMoved",
                "new_origin", new_origin.ToString());
@@ skipping 70 matching lines @@
   }
 }
 
 ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
   aura::Window* root_window = window_->GetRootWindow();
   if (!root_window)
     return NULL;
   return root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
 }
 
-void RenderWidgetHostViewAura::Shutdown() {
-  if (!in_shutdown_) {
-    in_shutdown_ = true;
-    host_->Shutdown();
-  }
-}
-
 bool RenderWidgetHostViewAura::NeedsInputGrab() {
   return popup_type_ == blink::WebPopupTypeSelect;
 }
 
 bool RenderWidgetHostViewAura::NeedsMouseCapture() {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   return NeedsInputGrab();
 #endif
   return false;
 }
@@ skipping 288 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content