Revert 170458 - Hide new Autofill Popup on Main Widget Resize or Move.

chrome/browser/ui/views/autofill/autofill_popup_view_views.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 "autofill_popup_view_views.h"
 
 #include "chrome/browser/ui/views/autofill/autofill_external_delegate_views.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ skipping 27 matching lines @@
 }
 
 AutofillPopupViewViews::~AutofillPopupViewViews() {
   external_delegate_->InvalidateView();
 }
 
 void AutofillPopupViewViews::Hide() {
   if (GetWidget())
     GetWidget()->Close();
   web_contents_->GetRenderViewHost()->RemoveKeyboardListener(this);
-
-  views::Widget* browser_widget =
-      views::Widget::GetTopLevelWidgetForNativeView(
-          web_contents_->GetView()->GetTopLevelNativeWindow());
-  browser_widget->RemoveObserver(this);
 }
 
 void AutofillPopupViewViews::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawColor(kPopupBackground);
   OnPaintBorder(canvas);
 
   for (size_t i = 0; i < autofill_values().size(); ++i) {
     gfx::Rect line_rect = GetRectForRow(i, width());
 
     if (autofill_unique_ids()[i] == WebAutofillClient::MenuItemIDSeparator)
       canvas->DrawRect(line_rect, kLabelTextColor);
     else
       DrawAutofillEntry(canvas, i, line_rect);
   }
 }
 
-void AutofillPopupViewViews::OnWidgetBoundsChanged(views::Widget* widget,
-                                                 const gfx::Rect& new_bounds) {
-  external_delegate()->HideAutofillPopup();
-}
-
 bool AutofillPopupViewViews::HandleKeyPressEvent(ui::KeyEvent* event) {
   switch (event->key_code()) {
     case ui::VKEY_UP:
       SelectPreviousLine();
       return true;
     case ui::VKEY_DOWN:
       SelectNextLine();
       return true;
     case ui::VKEY_PRIOR:
       SetSelectedLine(0);
       return true;
     case ui::VKEY_NEXT:
       SetSelectedLine(autofill_values().size() - 1);
       return true;
     case ui::VKEY_ESCAPE:
-       external_delegate()->HideAutofillPopup();
+      if (external_delegate()) {
+        external_delegate()->HideAutofillPopup();
+      } else {
+        Hide();
+      }
       return true;
     case ui::VKEY_DELETE:
       return event->IsShiftDown() && RemoveSelectedLine();
     case ui::VKEY_RETURN:
       return AcceptSelectedLine();
     default:
       return false;
   }
 }
 
 void AutofillPopupViewViews::ShowInternal() {
   if (!GetWidget()) {
     // The widget is destroyed by the corresponding NativeWidget, so we use
     // a weak pointer to hold the reference and don't have to worry about
     // deletion.
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
     params.delegate = this;
     params.can_activate = false;
     params.transparent = true;
     params.parent = web_contents_->GetView()->GetTopLevelNativeWindow();
     widget->Init(params);
     widget->SetContentsView(this);
     widget->Show();
 
     gfx::Rect client_area;
     web_contents_->GetContainerBounds(&client_area);
     widget->SetBounds(client_area);
-
-    // Setup an observer to check for when the browser moves or changes size,
-    // since the popup should always be hidden in those cases.
-    views::Widget* browser_widget =
-        views::Widget::GetTopLevelWidgetForNativeView(
-            web_contents_->GetView()->GetTopLevelNativeWindow());
-    browser_widget->AddObserver(this);
   }
 
   set_border(views::Border::CreateSolidBorder(kBorderThickness, kBorderColor));
 
   UpdateBoundsAndRedrawPopup();
 
   web_contents_->GetRenderViewHost()->AddKeyboardListener(this);
 }
 
 void AutofillPopupViewViews::InvalidateRow(size_t row) {
@@ skipping 62 matching lines @@
   canvas->DrawStringInt(
       autofill_labels()[index],
       label_font(),
       kLabelTextColor,
       x_align_left + kEndPadding,
       entry_rect.y(),
       canvas->GetStringWidth(autofill_labels()[index], label_font()),
       entry_rect.height(),
       gfx::Canvas::TEXT_ALIGN_CENTER);
 }