mash: Port KeyboardUIMus to mojo:ash; remove sysui.

ash/sysui/sysui_application.cc

Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
deleted file mode 100644
index ac14515a145bcd6782278bca9e16bcbed52899f8..0000000000000000000000000000000000000000
--- a/ash/sysui/sysui_application.cc
+++ /dev/null
@@ -1,326 +0,0 @@
-// 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>
-
-#include "ash/common/login_status.h"
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/shell_window_ids.h"
-#include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
-#include "ash/host/ash_window_tree_host_init_params.h"
-#include "ash/host/ash_window_tree_host_platform.h"
-#include "ash/public/interfaces/ash_window_type.mojom.h"
-#include "ash/public/interfaces/container.mojom.h"
-#include "ash/root_window_settings.h"
-#include "ash/shell.h"
-#include "ash/shell_init_params.h"
-#include "ash/sysui/keyboard_ui_mus.h"
-#include "ash/sysui/shell_delegate_mus.h"
-#include "ash/sysui/stub_context_factory.h"
-#include "base/bind.h"
-#include "base/files/file_path.h"
-#include "base/path_service.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "services/catalog/public/cpp/resource_loader.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/ui/public/cpp/property_type_converters.h"
-#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
-#include "ui/aura/env.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/message_center/message_center.h"
-#include "ui/platform_window/stub/stub_window.h"
-#include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/native_widget_mus.h"
-#include "ui/views/mus/window_manager_connection.h"
-#include "ui/views/views_delegate.h"
-
-#if defined(OS_CHROMEOS)
-#include "chromeos/audio/cras_audio_handler.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "device/bluetooth/dbus/bluez_dbus_manager.h"
-#endif
-
-using views::ViewsDelegate;
-
-namespace ash {
-namespace sysui {
-
-namespace {
-
-const char kResourceFileStrings[] = "ash_test_strings.pak";
-const char kResourceFile100[] = "ash_test_resources_100_percent.pak";
-const char kResourceFile200[] = "ash_test_resources_200_percent.pak";
-
-// Tries to determine the corresponding mash container from widget init params.
-bool GetContainerForWidget(const views::Widget::InitParams& params,
-                           ash::mojom::Container* container) {
-  switch (params.parent->id()) {
-    case kShellWindowId_WallpaperContainer:
-      *container = ash::mojom::Container::WALLPAPER;
-      return true;
-
-    case kShellWindowId_ShelfContainer:
-      *container = ash::mojom::Container::USER_PRIVATE_SHELF;
-      return true;
-
-    case kShellWindowId_StatusContainer:
-      *container = ash::mojom::Container::STATUS;
-      return true;
-  }
-
-  // Determine the container based on Widget type.
-  switch (params.type) {
-    case views::Widget::InitParams::Type::TYPE_BUBBLE:
-      *container = ash::mojom::Container::BUBBLES;
-      return true;
-
-    case views::Widget::InitParams::Type::TYPE_MENU:
-      *container = ash::mojom::Container::MENUS;
-      return true;
-
-    case views::Widget::InitParams::Type::TYPE_TOOLTIP:
-      *container = ash::mojom::Container::DRAG_AND_TOOLTIPS;
-      return true;
-
-    default:
-      break;
-  }
-  return false;
-}
-
-// Tries to determine the corresponding ash window type from the ash container
-// for the widget.
-ash::mojom::AshWindowType GetAshWindowType(aura::Window* container) {
-  DCHECK(container);
-  int id = container->id();
-  if (id == kShellWindowId_ShelfContainer)
-    return ash::mojom::AshWindowType::SHELF;
-  if (id == kShellWindowId_StatusContainer)
-    return ash::mojom::AshWindowType::STATUS_AREA;
-  return ash::mojom::AshWindowType::COUNT;
-}
-
-// Creates a StubWindow, which means this window never receives any input event,
-// or displays anything to the user.
-class AshWindowTreeHostMus : public AshWindowTreeHostPlatform {
- public:
-  explicit AshWindowTreeHostMus(const gfx::Rect& initial_bounds)
-      : AshWindowTreeHostPlatform() {
-    std::unique_ptr<ui::PlatformWindow> window(new ui::StubWindow(this));
-    window->SetBounds(initial_bounds);
-    SetPlatformWindow(std::move(window));
-  }
-
-  ~AshWindowTreeHostMus() override {}
-
-  void OnBoundsChanged(const gfx::Rect& bounds) override {
-    if (platform_window())
-      AshWindowTreeHostPlatform::OnBoundsChanged(bounds);
-  }
-};
-
-AshWindowTreeHost* CreateWindowTreeHostMus(
-    const AshWindowTreeHostInitParams& init_params) {
-  return new AshWindowTreeHostMus(init_params.initial_bounds);
-}
-
-// Responsible for setting up a RootWindowSettings object for the root-window
-// created for the views::Widget objects.
-class NativeWidgetFactory {
- public:
-  NativeWidgetFactory() {
-    ViewsDelegate* views_delegate = ViewsDelegate::GetInstance();
-    DCHECK(views_delegate);
-    views_delegate->set_native_widget_factory(base::Bind(
-        &NativeWidgetFactory::InitNativeWidget, base::Unretained(this)));
-  }
-
-  ~NativeWidgetFactory() {
-    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) {
-      ash::mojom::Container container;
-      if (GetContainerForWidget(params, &container)) {
-        properties[ash::mojom::kWindowContainer_Property] =
-            mojo::ConvertTo<std::vector<uint8_t>>(
-                static_cast<int32_t>(container));
-      }
-      ash::mojom::AshWindowType type = GetAshWindowType(params.parent);
-      if (type != ash::mojom::AshWindowType::COUNT) {
-        properties[ash::mojom::kAshWindowType_Property] =
-            mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(type));
-      }
-    }
-
-    // AshInit installs a stub implementation of ui::ContextFactory, so that the
-    // AshWindowTreeHost instances created do not actually show anything to the
-    // user. However, when creating a views::Widget instance, the
-    // WindowManagerConnection creates a WindowTreeHostMus instance, which
-    // creates a ui::Compositor, and it needs a real ui::ContextFactory
-    // implementation. So, unset the context-factory here temporarily when
-    // creating NativeWidgetMus. But restore the stub instance afterwards, so
-    // that it is used when new AshWindowTreeHost instances are created (e.g.
-    // when a new monitor is attached).
-    ui::ContextFactory* factory = aura::Env::GetInstance()->context_factory();
-    aura::Env::GetInstance()->set_context_factory(nullptr);
-    views::NativeWidgetMus* native_widget =
-        static_cast<views::NativeWidgetMus*>(
-            views::WindowManagerConnection::Get()->CreateNativeWidgetMus(
-                properties, params, delegate));
-    aura::Env::GetInstance()->set_context_factory(factory);
-
-    // TODO: Set the correct display id here.
-    InitRootWindowSettings(native_widget->GetRootWindow())->display_id =
-        Shell::GetInstance()
-            ->display_manager()
-            ->GetPrimaryDisplayCandidate()
-            .id();
-    return native_widget;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(NativeWidgetFactory);
-};
-
-}  // namespace
-
-class AshInit {
- public:
-  AshInit()
-      : worker_pool_(
-            new base::SequencedWorkerPool(2,
-                                          "AshWorkerPool",
-                                          base::TaskPriority::USER_BLOCKING)) {
-    ui::RegisterPathProvider();
-  }
-
-  ~AshInit() { worker_pool_->Shutdown(); }
-
-  aura::Window* root() { return Shell::GetPrimaryRootWindow(); }
-
-  void Initialize(::shell::Connector* connector,
-                  const ::shell::Identity& identity) {
-    InitializeResourceBundle(connector);
-    aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
-    MaterialDesignController::Initialize();
-    window_manager_connection_ =
-        views::WindowManagerConnection::Create(connector, identity);
-
-    // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
-    // installs and uses the ScreenAsh. This can be removed once ash learns to
-    // talk to mus for managing displays.
-    // TODO(mfomitchev): We need to fix this. http://crbug.com/607300
-    display::Screen::SetScreenInstance(nullptr);
-
-    // Install some hook so that the WindowTreeHostMus created for widgets can
-    // be hooked up correctly.
-    native_widget_factory_.reset(new NativeWidgetFactory());
-
-    AshWindowTreeHost::SetFactory(base::Bind(&CreateWindowTreeHostMus));
-
-    ash_delegate_ = new ShellDelegateMus();
-
-    InitializeComponents();
-
-    ShellInitParams init_params;
-    init_params.delegate = ash_delegate_;
-    init_params.context_factory = new StubContextFactory;
-    init_params.blocking_pool = worker_pool_.get();
-    init_params.in_mus = true;
-    init_params.keyboard_factory =
-        base::Bind(&KeyboardUIMus::Create, connector);
-    Shell::CreateInstance(init_params);
-    Shell::GetInstance()->CreateShelf();
-    Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER);
-
-    Shell::GetPrimaryRootWindow()->GetHost()->Show();
-  }
-
-  void InitializeResourceBundle(::shell::Connector* connector) {
-    if (ui::ResourceBundle::HasSharedInstance())
-      return;
-
-    std::set<std::string> resource_paths;
-    resource_paths.insert(kResourceFileStrings);
-    resource_paths.insert(kResourceFile100);
-    resource_paths.insert(kResourceFile200);
-
-    catalog::ResourceLoader loader;
-    filesystem::mojom::DirectoryPtr directory;
-    connector->ConnectToInterface("mojo:catalog", &directory);
-    CHECK(loader.OpenFiles(std::move(directory), resource_paths));
-
-    // Load ash resources and strings; not 'common' (Chrome) resources.
-    ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
-        loader.TakeFile(kResourceFileStrings),
-        base::MemoryMappedFile::Region::kWholeFile);
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_100P)) {
-      rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100),
-                             ui::SCALE_FACTOR_100P);
-    }
-    if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_200P)) {
-      rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200),
-                             ui::SCALE_FACTOR_200P);
-    }
-  }
-
-  void InitializeComponents() {
-    message_center::MessageCenter::Initialize();
-
-#if defined(OS_CHROMEOS)
-    chromeos::DBusThreadManager::Initialize();
-    bluez::BluezDBusManager::Initialize(
-        chromeos::DBusThreadManager::Get()->GetSystemBus(),
-        chromeos::DBusThreadManager::Get()->IsUsingStub(
-            chromeos::DBusClientBundle::BLUETOOTH));
-    chromeos::CrasAudioHandler::InitializeForTesting();
-#endif
-  }
-
- private:
-  scoped_refptr<base::SequencedWorkerPool> worker_pool_;
-  std::unique_ptr<views::AuraInit> aura_init_;
-  ShellDelegateMus* ash_delegate_ = nullptr;
-  std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
-  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
-
-  DISALLOW_COPY_AND_ASSIGN(AshInit);
-};
-
-SysUIApplication::SysUIApplication() {}
-
-SysUIApplication::~SysUIApplication() {}
-
-void SysUIApplication::OnStart(const ::shell::Identity& identity) {
-  ash_init_.reset(new AshInit());
-  ash_init_->Initialize(connector(), identity);
-
-  ui::mojom::InputDeviceServerPtr server;
-  connector()->ConnectToInterface("mojo:ui", &server);
-  input_device_client_.Connect(std::move(server));
-}
-
-bool SysUIApplication::OnConnect(const ::shell::Identity& remote_identity,
-                                 ::shell::InterfaceRegistry* registry) {
-  return true;
-}
-
-}  // namespace sysui
-}  // namespace ash