diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 23:36:48 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 23:36:48 +0000 |
| commit | 0054e027d8a116598ccbfce520733110d8965fc7 (patch) | |
| tree | 23226dba8123ba74efae4dfc2f3288e9c9942108 /ash/system/web_notification | |
| parent | 7e95a6d21513e464cab6ab69f71fde4824bec3f8 (diff) | |
| download | chromium_src-0054e027d8a116598ccbfce520733110d8965fc7.zip chromium_src-0054e027d8a116598ccbfce520733110d8965fc7.tar.gz chromium_src-0054e027d8a116598ccbfce520733110d8965fc7.tar.bz2 | |
Revert 184572
This causes a crash when opening settings from the system tray, see crbug.com/184572
> Remove close_on_deactivate=false for tray bubbles.
>
> Actually we want to close those bubbles on deactivation (like, opening
> settings page or opening the chat window for a notification). To deal
> with the race condition of close-on-deactivate and button action,
> a static delay is introduced.
>
> BUG=177075, 169940
> TEST=manually checked with goobuntu, see the bugs for the actual steps
>
>
> Review URL: https://chromiumcodereview.appspot.com/12335044
TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/12378088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/web_notification')
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 67711a4..998123f 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -61,6 +61,7 @@ class WebNotificationBubbleWrapper { tray->GetAnchorAlignment(); views::TrayBubbleView::InitParams init_params = bubble->GetInitParams(anchor_alignment); + init_params.close_on_deactivate = false; views::View* anchor = tray->tray_container(); if (anchor_alignment == views::TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) { gfx::Point bounds(anchor->width() / 2, 0); |