Revert r283051: Fix positioning of Autofill popups

chrome/browser/ui/views/autofill/autofill_popup_base_view.cc

 // Copyright 2014 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 "chrome/browser/ui/views/autofill/autofill_popup_base_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
@@ skipping 45 matching lines @@
         ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE),
         ui::AcceleratorManager::kNormalPriority,
         this);
 
     // 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.context = container_view();
+    params.parent = container_view();
     widget->Init(params);
     widget->SetContentsView(this);
 
     // No animation for popup appearance (too distracting).
     wm::SetWindowVisibilityAnimationTransition(
         widget->GetNativeView(), wm::ANIMATE_HIDE);
   }
 
   SetBorder(views::Border::CreateSolidBorder(kPopupBorderThickness,
                                              kBorderColor));
@@ skipping 18 matching lines @@
     // assume the the widget is still valid after this point.
     // http://crbug.com/229224
     // NOTE: This deletes |this|.
     GetWidget()->Close();
   } else {
     delete this;
   }
 }
 
 void AutofillPopupBaseView::RemoveObserver() {
-  if (observing_widget_) {
-    observing_widget_->GetFocusManager()->UnregisterAccelerators(this);
-    observing_widget_->RemoveObserver(this);
-  }
+  observing_widget_->GetFocusManager()->UnregisterAccelerators(this);
+  observing_widget_->RemoveObserver(this);
   views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
 }
 
 void AutofillPopupBaseView::DoUpdateBoundsAndRedrawPopup() {
   GetWidget()->SetBounds(delegate_->popup_bounds());
   SchedulePaint();
 }
 
 void AutofillPopupBaseView::OnNativeFocusChange(
     gfx::NativeView focused_before,
     gfx::NativeView focused_now) {
   if (GetWidget() && GetWidget()->GetNativeView() != focused_now)
     HideController();
 }
 
-void AutofillPopupBaseView::OnWidgetDestroying(views::Widget* widget) {
-  DCHECK_EQ(widget, observing_widget_);
-  observing_widget_ = NULL;
-}
-
 void AutofillPopupBaseView::OnWidgetBoundsChanged(views::Widget* widget,
                                                   const gfx::Rect& new_bounds) {
   DCHECK_EQ(widget, observing_widget_);
   HideController();
 }
 
 void AutofillPopupBaseView::OnMouseCaptureLost() {
   ClearSelection();
 }
 
@@ skipping 102 matching lines @@
 void AutofillPopupBaseView::HideController() {
   if (delegate_)
     delegate_->Hide();
 }
 
 gfx::NativeView AutofillPopupBaseView::container_view() {
   return delegate_->container_view();
 }
 
 }  // namespace autofill