mash: Make system tray bubble close when another window is activated

mash/wm/root_window_controller.cc

 // Copyright 2016 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 "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
@@ skipping 112 matching lines @@
   layout_manager_[user_background].reset(new BackgroundLayout(user_background));
   mus::Window* login_app = GetWindowForContainer(mojom::Container::LOGIN_APP);
   layout_manager_[login_app].reset(new ScreenlockLayout(login_app));
   mus::Window* user_shelf = GetWindowForContainer(mojom::Container::USER_SHELF);
   layout_manager_[user_shelf].reset(new ShelfLayout(user_shelf));
 
   mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
   layout_manager_[window].reset(new WindowLayout(window));
   window_manager_client()->AddActivationParent(window);
 
+  // Bubble windows must be allowed to activate because some of them rely on
+  // deactivation to close.
+  mus::Window* bubbles = GetWindowForContainer(mojom::Container::BUBBLES);
+  window_manager_client()->AddActivationParent(bubbles);
+
   AddAccelerators();
 
   window_manager_->Initialize(this, app_->session());
 
   shadow_controller_.reset(new ShadowController(root->connection()));
 
   app_->OnRootWindowControllerDoneInit(this);
 }
 
 void RootWindowController::OnConnectionLost(
@@ skipping 43 matching lines @@
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_STICKY_WINDOWS,
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_PRESENTATION_WINDOWS,
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_SHELF, mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::LOGIN_WINDOWS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::LOGIN_APP, mojom::Container::LOGIN_WINDOWS);
   CreateContainer(mojom::Container::LOGIN_SHELF,
                   mojom::Container::LOGIN_WINDOWS);
+  CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash