Index: chrome/browser/ui/views/autofill/autofill_popup_base_view.cc |
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc |
index 861718b8e1edad875a91246c39e0c12d212e4b97..ced38990ff6767f987a1b1b0563574168d155d8c 100644 |
--- a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc |
+++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc |
@@ -63,7 +63,7 @@ void AutofillPopupBaseView::DoShow() { |
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); |
@@ -102,10 +102,8 @@ void AutofillPopupBaseView::DoHide() { |
} |
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); |
} |
@@ -121,11 +119,6 @@ void AutofillPopupBaseView::OnNativeFocusChange( |
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_); |