| Index: ash/common/system/tray/system_tray.cc
|
| diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
|
| index 8f3f1945e214d11532923f9ce4c8cac51d6188f4..da13b66a6e0085676536b59b1bcec31d72c15a8b 100644
|
| --- a/ash/common/system/tray/system_tray.cc
|
| +++ b/ash/common/system/tray/system_tray.cc
|
| @@ -48,6 +48,7 @@
|
| #include "ash/root_window_controller.h"
|
| #include "ash/shell.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| +#include "ash/wm/widget_finder.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/metrics/histogram_macros.h"
|
| @@ -189,7 +190,7 @@ class SystemTray::ActivationObserver
|
| tray_->GetSystemBubble()->bubble_view()->GetWidget();
|
| // Don't close the bubble if a transient child is gaining or losing
|
| // activation.
|
| - if (bubble_widget == wm_gained_active->GetInternalWidget() ||
|
| + if (bubble_widget == GetInternalWidgetForWindow(gained_active) ||
|
| ::wm::HasTransientAncestor(gained_active,
|
| bubble_widget->GetNativeWindow()) ||
|
| (lost_active && ::wm::HasTransientAncestor(
|
|
|