Makes ash/mus use RootWindowControllerCommon

ash/sysui/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/sysui/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 42 matching lines @@
 namespace ash {
 namespace sysui {
 
 namespace {
 
 const char kResourceFileStrings[] = "ash_resources_strings.pak";
 const char kResourceFile100[] = "ash_resources_100_percent.pak";
 const char kResourceFile200[] = "ash_resources_200_percent.pak";
 
 // Tries to determine the corresponding mash container from widget init params.
-mojom::Container GetContainerId(const views::Widget::InitParams& params) {
-  const int id = params.parent->id();
-  if (id == kShellWindowId_DesktopBackgroundContainer)
-    return mojom::Container::USER_BACKGROUND;
-  if (id == kShellWindowId_ShelfContainer)
-    return mojom::Container::USER_PRIVATE_SHELF;
-  if (id == kShellWindowId_StatusContainer)
-    return mojom::Container::STATUS;
+bool GetContainerForWidget(const views::Widget::InitParams& params,
+                           mojom::Container* container) {
+  switch (params.parent->id()) {
+    case kShellWindowId_DesktopBackgroundContainer:
+      *container = mojom::Container::USER_BACKGROUND;
+      return true;
+
+    case kShellWindowId_ShelfContainer:
+      *container = mojom::Container::USER_PRIVATE_SHELF;
+      return true;
+
+    case kShellWindowId_StatusContainer:
+      *container = mojom::Container::STATUS;
+      return true;
+  }
 
   // Determine the container based on Widget type.
   switch (params.type) {
     case views::Widget::InitParams::Type::TYPE_BUBBLE:
-      return mojom::Container::BUBBLES;
+      *container = mojom::Container::BUBBLES;
+      return true;
+
     case views::Widget::InitParams::Type::TYPE_MENU:
-      return mojom::Container::MENUS;
+      *container = mojom::Container::MENUS;
+      return true;
+
     case views::Widget::InitParams::Type::TYPE_TOOLTIP:
-      return mojom::Container::DRAG_AND_TOOLTIPS;
+      *container = mojom::Container::DRAG_AND_TOOLTIPS;
+      return true;
+
     default:
-      return mojom::Container::COUNT;
+      break;
   }
+  return false;
 }
 
 // Tries to determine the corresponding ash window type from the ash container
 // for the widget.
 mojom::AshWindowType GetAshWindowType(aura::Window* container) {
   DCHECK(container);
   int id = container->id();
   if (id == kShellWindowId_ShelfContainer)
     return mojom::AshWindowType::SHELF;
   if (id == kShellWindowId_StatusContainer)
@@ skipping 40 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) {
-      mojom::Container container = GetContainerId(params);
-      if (container != mojom::Container::COUNT) {
+      mojom::Container container;
+      if (GetContainerForWidget(params, &container)) {
         properties[mojom::kWindowContainer_Property] =
             mojo::ConvertTo<std::vector<uint8_t>>(
                 static_cast<int32_t>(container));
       }
       mojom::AshWindowType type = GetAshWindowType(params.parent);
       if (type != mojom::AshWindowType::COUNT) {
         properties[mojom::kAshWindowType_Property] =
             mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(type));
       }
     }
@@ skipping 168 matching lines @@
 void SysUIApplication::Create(
     ::shell::Connection* connection,
     mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash