Enable mash shelf tooltips.

ash/mus/sysui_application.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 "ash/mus/sysui_application.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.h"
 #include "ash/mus/keyboard_ui_mus.h"
@@ skipping 27 matching lines @@
 #include "ui/events/devices/device_data_manager.h"
 #endif
 
 using views::ViewsDelegate;
 
 namespace ash {
 namespace sysui {
 
 namespace {
 
-// Tries to determine the corresponding container in mash from the ash container
-// for the widget.
-mash::wm::mojom::Container GetContainerId(aura::Window* container) {
-  DCHECK(container);
-  int id = container->id();
+// Tries to determine the corresponding mash container from widget init params.
+mash::wm::mojom::Container GetContainerId(
+    const views::Widget::InitParams& params) {
+  DCHECK(params.parent);
+  const int id = params.parent->id();
   if (id == kShellWindowId_DesktopBackgroundContainer)
     return mash::wm::mojom::Container::USER_BACKGROUND;
   // mash::wm::ShelfLayout manages both the shelf and the status area.
   if (id == kShellWindowId_ShelfContainer ||
       id == kShellWindowId_StatusContainer) {
     return mash::wm::mojom::Container::USER_SHELF;
   }
+
+  // Show mash shelf tooltips and settings bubbles in the menu container.
+  if (params.type == views::Widget::InitParams::Type::TYPE_MENU ||
+      params.type == views::Widget::InitParams::Type::TYPE_BUBBLE) {
+    return mash::wm::mojom::Container::MENUS;
+  }
+
+  if (params.type == views::Widget::InitParams::Type::TYPE_TOOLTIP)
+    return mash::wm::mojom::Container::TOOLTIPS;
+
   return mash::wm::mojom::Container::COUNT;
 }
 
 // Tries to determine the corresponding ash window type from the ash container
 // for the widget.
 mash::wm::mojom::AshWindowType GetAshWindowType(aura::Window* container) {
   DCHECK(container);
   int id = container->id();
   if (id == kShellWindowId_ShelfContainer)
     return mash::wm::mojom::AshWindowType::SHELF;
@@ skipping 41 matching lines @@
     ViewsDelegate::GetInstance()->set_native_widget_factory(
         ViewsDelegate::NativeWidgetFactory());
   }
 
  private:
   views::NativeWidget* InitNativeWidget(
       const views::Widget::InitParams& params,
       views::internal::NativeWidgetDelegate* delegate) {
     std::map<std::string, std::vector<uint8_t>> properties;
     if (params.parent) {
-      mash::wm::mojom::Container container = GetContainerId(params.parent);
+      mash::wm::mojom::Container container = GetContainerId(params);
       if (container != mash::wm::mojom::Container::COUNT) {
         properties[mash::wm::mojom::kWindowContainer_Property] =
             mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
                 static_cast<int32_t>(container));
       }
       mash::wm::mojom::AshWindowType type = GetAshWindowType(params.parent);
       if (type != mash::wm::mojom::AshWindowType::COUNT) {
         properties[mash::wm::mojom::kAshWindowType_Property] =
             mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
                 static_cast<int32_t>(type));
@@ skipping 151 matching lines @@
   ash_init_.reset(new AshInit());
   ash_init_->Initialize(connector);
 }
 
 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) {
   return true;
 }
 
 }  // namespace sysui
 }  // namespace ash