diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 23:32:23 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 23:32:23 +0000 |
| commit | c4dca5876da4e912fde959249de4a1d704884582 (patch) | |
| tree | d624cc6a78a2307ed85db3c98eb8e3d9a9c9a070 /ui/views/bubble | |
| parent | c53ce46a3bff3f1990095588ad6764bfd4480cad (diff) | |
| download | chromium_src-c4dca5876da4e912fde959249de4a1d704884582.zip chromium_src-c4dca5876da4e912fde959249de4a1d704884582.tar.gz chromium_src-c4dca5876da4e912fde959249de4a1d704884582.tar.bz2 | |
Revert 137059 - Better fix for closing uber tray when clicking on Desktop
Bug=None
Test=Manual
Review URL: https://chromiumcodereview.appspot.com/9877015
TBR=pkotwicz@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=137752
Review URL: https://chromiumcodereview.appspot.com/10383236
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/bubble')
| -rw-r--r-- | ui/views/bubble/bubble_delegate.cc | 7 | ||||
| -rw-r--r-- | ui/views/bubble/bubble_delegate.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc index 072f355..92645a8 100644 --- a/ui/views/bubble/bubble_delegate.cc +++ b/ui/views/bubble/bubble_delegate.cc @@ -25,7 +25,6 @@ Widget* CreateBubbleWidget(BubbleDelegateView* bubble) { Widget::InitParams bubble_params(Widget::InitParams::TYPE_BUBBLE); bubble_params.delegate = bubble; bubble_params.transparent = true; - bubble_params.close_on_deactivate = bubble->close_on_deactivate(); if (bubble->parent_window()) bubble_params.parent = bubble->parent_window(); else @@ -213,6 +212,12 @@ void BubbleDelegateView::OnWidgetVisibilityChanged(Widget* widget, } } +void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget, + bool active) { + if (close_on_deactivate() && widget == GetWidget() && !active) + GetWidget()->Close(); +} + void BubbleDelegateView::OnWidgetMoved(Widget* widget) { if (move_with_anchor() && anchor_widget() == widget) SizeToContents(); diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h index 25d13f8..be66f80 100644 --- a/ui/views/bubble/bubble_delegate.h +++ b/ui/views/bubble/bubble_delegate.h @@ -50,6 +50,7 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView, // Widget::Observer overrides: virtual void OnWidgetClosing(Widget* widget) OVERRIDE; virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible) OVERRIDE; + virtual void OnWidgetActivationChanged(Widget* widget, bool active) OVERRIDE; virtual void OnWidgetMoved(Widget* widget) OVERRIDE; bool close_on_esc() const { return close_on_esc_; } |