Update cros network info bubble

ash/common/system/tray/system_tray.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 51 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_client.h"
 
 using views::TrayBubbleView;
 
 namespace ash {
 
 namespace {
 
 // A tray item that just reserves space in the tray.
@@ skipping 89 matching lines @@
   }
 
   ~ActivationObserver() override {
     Shell::GetInstance()->activation_client()->RemoveObserver(this);
   }
 
   // WmActivationObserver:
   void OnWindowActivated(ActivationReason reason,
                          aura::Window* gained_active,
                          aura::Window* lost_active) override {
-    WmWindow* wm_gained_active = WmWindow::Get(gained_active);
     if (!tray_->HasSystemBubble() || !gained_active)
       return;
 
+    WmWindow* wm_gained_active = WmWindow::Get(gained_active);
     int container_id =
         wm::GetContainerForWindow(wm_gained_active)->GetShellWindowId();
 
     // Don't close the bubble if a popup notification is activated.
     if (container_id == kShellWindowId_StatusContainer)
       return;
 
-    if (tray_->GetSystemBubble()->bubble_view()->GetWidget() !=
-        wm_gained_active->GetInternalWidget()) {
-      tray_->CloseSystemBubble();
+    views::Widget* bubble_widget =
+        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() ||
+        ::wm::HasTransientAncestor(gained_active,
+                                   bubble_widget->GetNativeWindow()) ||
+        ::wm::HasTransientAncestor(lost_active,
+                                   bubble_widget->GetNativeWindow())) {
+      return;
     }
+
+    tray_->CloseSystemBubble();
   }
 
  private:
   SystemTray* tray_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivationObserver);
 };
 
 // SystemTray
 
@@ skipping 565 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash