ash: Don't dismiss app list on bubbles.

ash: Don't dismiss app list on bubbles.

BUG=122450
TEST=Verify fix for issue 122450.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132260

[Ben Goodger (Google), 2012-04-13 15:24:10]

Do we still have setting bubbles?

-Ben

On Thu, Apr 12, 2012 at 3:59 PM, <xiyuan@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> ash: Don't dismiss app list on bubbles.
>
> BUG=122450
> TEST=Verify fix for issue 122450.
>
>
> Please review this at
http://codereview.chromium.**org/10071026/<http://codereview.chromium.org/100...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ash/app_list/app_list.cc
>
>
> Index: ash/app_list/app_list.cc
> diff --git a/ash/app_list/app_list.cc b/ash/app_list/app_list.cc
> index f2a007fc29c7f3ca1b9a7914481717**42e6db7008..**
> cfa35bcf629fe23ce96b292757534e**d8187a678c 100644
> --- a/ash/app_list/app_list.cc
> +++ b/ash/app_list/app_list.cc
> @@ -263,10 +263,15 @@ void AppList::OnWidgetClosing(**views::Widget*
> widget) {
>  void AppList::**OnWidgetActivationChanged(**views::Widget* widget, bool
> active) {
>   DCHECK(view_->GetWidget() == widget);
>   if (view_ && is_visible_ && !active) {
> -    aura::Window* self = view_->GetWidget()->**GetNativeWindow();
> +    aura::Window* applist_container = Shell::GetInstance()->**
> GetContainer(
> +        internal::kShellWindowId_**AppListContainer);
> +    aura::Window* bubble_container = Shell::GetInstance()->**
> GetContainer(
> +        internal::kShellWindowId_**SettingBubbleContainer);
>     aura::Window* active_window = ash::wm::GetActiveWindow();
> -    if (active_window->parent() != self->parent())
> +    if (active_window->parent() != applist_container &&
> +        active_window->parent() != bubble_container) {
>       SetVisible(false);
> +    }
>   }
>  }
>
>
>
>

[xiyuan, 2012-04-13 15:58:53]

On 2012/04/13 15:24:10, Ben Goodger (Google) wrote:
> Do we still have setting bubbles?
> 
> -Ben
> 

Yes, system tray still uses it.

  SystemTrayBubble(ash::SystemTray* tray,
                   views::View* anchor,
                   std::vector<ash::SystemTrayItem*>& items,
                   bool detailed)
      : views::BubbleDelegateView(anchor, views::BubbleBorder::BOTTOM_RIGHT),
        tray_(tray),
        items_(items),
        detailed_(detailed),
        can_activate_(true),
        autoclose_delay_(0) {
    set_margin(0);
    set_parent_window(ash::Shell::GetInstance()->GetContainer(
        ash::internal::kShellWindowId_SettingBubbleContainer));
    set_notify_enter_exit_on_child(true);
  }

[Ben Goodger (Google), 2012-04-13 17:30:04]

lgtm

On Fri, Apr 13, 2012 at 8:58 AM, <xiyuan@chromium.org> wrote:

> On 2012/04/13 15:24:10, Ben Goodger (Google) wrote:
>
>> Do we still have setting bubbles?
>>
>
>  -Ben
>>
>
>
> Yes, system tray still uses it.
>
>  SystemTrayBubble(ash::**SystemTray* tray,
>                   views::View* anchor,
>                   std::vector<ash::**SystemTrayItem*>& items,
>                   bool detailed)
>      : views::BubbleDelegateView(**anchor, views::BubbleBorder::BOTTOM_**
> RIGHT),
>        tray_(tray),
>        items_(items),
>        detailed_(detailed),
>        can_activate_(true),
>        autoclose_delay_(0) {
>    set_margin(0);
>    set_parent_window(ash::Shell::**GetInstance()->GetContainer(
>        ash::internal::kShellWindowId_**SettingBubbleContainer));
>    set_notify_enter_exit_on_**child(true);
>  }
>
>
>
>
>
>
>
http://codereview.chromium.**org/10071026/<http://codereview.chromium.org/100...
>

[commit-bot: I haz the power, 2012-04-13 19:19:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/xiyuan@chromium.org/10071026/1

[commit-bot: I haz the power, 2012-04-13 20:41:21]

Change committed as 132260