Revert of ash/mash: Add a mus-client that sets up ash to provide the system ui for mash.

ash/mus/sysui_application.cc

Index: ash/mus/sysui_application.cc
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
deleted file mode 100644
index f13acc9fe6db1efe3dffb625afbbe98e7ecf5816..0000000000000000000000000000000000000000
--- a/ash/mus/sysui_application.cc
+++ /dev/null
@@ -1,183 +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/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/shell_delegate_mus.h"
-#include "ash/mus/stub_context_factory.h"
-#include "ash/root_window_settings.h"
-#include "ash/shell.h"
-#include "ash/shell_init_params.h"
-#include "base/threading/sequenced_worker_pool.h"
-#include "ui/aura/env.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.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"
-
-using views::ViewsDelegate;
-
-namespace ash {
-namespace sysui {
-
-namespace {
-
-// 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() {
-    scoped_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) {
-    views::NativeWidgetMus* native_widget =
-        static_cast<views::NativeWidgetMus*>(
-            views::WindowManagerConnection::Get()->CreateNativeWidgetMus(
-                params, delegate));
-    // 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")) {
-    ui::RegisterPathProvider();
-    ui::ResourceBundle::InitSharedInstanceWithLocale(
-        "en-US", nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
-  }
-
-  ~AshInit() { worker_pool_->Shutdown(); }
-
-  aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
-
-  void Initialize(mojo::Shell* shell) {
-    aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
-    views::WindowManagerConnection::Create(shell);
-
-    gfx::Screen* screen = gfx::Screen::GetScreen();
-    DCHECK(screen);
-    gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
-
-    // 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.
-    gfx::Screen::SetScreenInstance(nullptr);
-
-    // Install some hook so that the WindowTreeHostMus created for widgets can
-    // be hooked up correctly.
-    native_widget_factory_.reset(new NativeWidgetFactory());
-
-    ash::AshWindowTreeHost::SetFactory(base::Bind(&CreateWindowTreeHostMus));
-    ash_delegate_ = new ShellDelegateMus;
-    message_center::MessageCenter::Initialize();
-
-    ash::ShellInitParams init_params;
-    init_params.delegate = ash_delegate_;
-    init_params.context_factory = new StubContextFactory;
-    init_params.blocking_pool = worker_pool_.get();
-    ash::Shell::CreateInstance(init_params);
-    ash::Shell::GetInstance()->CreateShelf();
-    ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
-        ash::user::LOGGED_IN_USER);
-    // Reset the context factory, so that NativeWidgetMus installs the context
-    // factory for the views::Widgets correctly.
-    aura::Env::GetInstance()->set_context_factory(nullptr);
-
-    ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
-    SetupWallpaper(SkColorSetARGB(255, 0, 255, 0));
-  }
-
-  void SetupWallpaper(SkColor color) {
-    SkBitmap bitmap;
-    bitmap.allocN32Pixels(16, 16);
-    bitmap.eraseColor(color);
-#if !defined(NDEBUG)
-    // In debug builds we generate a simple pattern that allows visually
-    // notice if transparency is broken.
-    {
-      SkAutoLockPixels alp(bitmap);
-      *bitmap.getAddr32(0, 0) = SkColorSetRGB(0, 0, 0);
-    }
-#endif
-    gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
-    ash::Shell::GetInstance()
-        ->desktop_background_controller()
-        ->SetWallpaperImage(wallpaper, wallpaper::WALLPAPER_LAYOUT_TILE);
-  }
-
- private:
-  scoped_refptr<base::SequencedWorkerPool> worker_pool_;
-  scoped_ptr<views::AuraInit> aura_init_;
-  ShellDelegateMus* ash_delegate_ = nullptr;
-  scoped_ptr<NativeWidgetFactory> native_widget_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(AshInit);
-};
-
-SysUIApplication::SysUIApplication() {}
-
-SysUIApplication::~SysUIApplication() {}
-
-void SysUIApplication::Initialize(mojo::Shell* shell,
-                                  const std::string& url,
-                                  uint32_t id) {
-  ash_init_.reset(new AshInit());
-  ash_init_->Initialize(shell);
-}
-
-}  // namespace sysui
-}  // namespace ash