Commit cc098ebe authored by estade@chromium.org's avatar estade@chromium.org

Revert r283051: Fix positioning of Autofill popups

patch broke windows

BUG=391316,394666

Review URL: https://codereview.chromium.org/391343010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283982 0039d316-1c4b-4281-b951-d872f2087c98
parent 2db830d0
...@@ -63,7 +63,7 @@ void AutofillPopupBaseView::DoShow() { ...@@ -63,7 +63,7 @@ void AutofillPopupBaseView::DoShow() {
views::Widget* widget = new views::Widget; views::Widget* widget = new views::Widget;
views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
params.delegate = this; params.delegate = this;
params.context = container_view(); params.parent = container_view();
widget->Init(params); widget->Init(params);
widget->SetContentsView(this); widget->SetContentsView(this);
...@@ -102,10 +102,8 @@ void AutofillPopupBaseView::DoHide() { ...@@ -102,10 +102,8 @@ void AutofillPopupBaseView::DoHide() {
} }
void AutofillPopupBaseView::RemoveObserver() { void AutofillPopupBaseView::RemoveObserver() {
if (observing_widget_) { observing_widget_->GetFocusManager()->UnregisterAccelerators(this);
observing_widget_->GetFocusManager()->UnregisterAccelerators(this); observing_widget_->RemoveObserver(this);
observing_widget_->RemoveObserver(this);
}
views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this); views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
} }
...@@ -121,11 +119,6 @@ void AutofillPopupBaseView::OnNativeFocusChange( ...@@ -121,11 +119,6 @@ void AutofillPopupBaseView::OnNativeFocusChange(
HideController(); HideController();
} }
void AutofillPopupBaseView::OnWidgetDestroying(views::Widget* widget) {
DCHECK_EQ(widget, observing_widget_);
observing_widget_ = NULL;
}
void AutofillPopupBaseView::OnWidgetBoundsChanged(views::Widget* widget, void AutofillPopupBaseView::OnWidgetBoundsChanged(views::Widget* widget,
const gfx::Rect& new_bounds) { const gfx::Rect& new_bounds) {
DCHECK_EQ(widget, observing_widget_); DCHECK_EQ(widget, observing_widget_);
......
...@@ -66,7 +66,6 @@ class AutofillPopupBaseView : public views::WidgetDelegateView, ...@@ -66,7 +66,6 @@ class AutofillPopupBaseView : public views::WidgetDelegateView,
gfx::NativeView focused_now) OVERRIDE; gfx::NativeView focused_now) OVERRIDE;
// views::WidgetObserver implementation. // views::WidgetObserver implementation.
virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
virtual void OnWidgetBoundsChanged(views::Widget* widget, virtual void OnWidgetBoundsChanged(views::Widget* widget,
const gfx::Rect& new_bounds) OVERRIDE; const gfx::Rect& new_bounds) OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment