Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: ash/mus/standalone/standalone_mash_main.cc

Issue 2833093002: WIP: simplified display management in ash (Closed)
Patch Set: x Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/standalone/manifest.json ('k') | ash/mus/test/ash_test_impl_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/standalone/standalone_mash_main.cc
diff --git a/ash/mus/standalone/standalone_mash_main.cc b/ash/mus/standalone/standalone_mash_main.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dd973039fc48c51092b7261c799169f0887c6ebc
--- /dev/null
+++ b/ash/mus/standalone/standalone_mash_main.cc
@@ -0,0 +1,106 @@
+// Copyright 2017 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/window_manager_application.h"
+#include "ash/shell.h"
+#include "ash/shell/example_app_list_presenter.h"
+#include "ash/shell/example_session_controller_client.h"
+#include "ash/shell/shell_delegate_impl.h"
+#include "ash/shell/window_type_launcher.h"
+#include "ash/shell/window_watcher.h"
+#include "ash/shell_observer.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/memory/ptr_util.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/ui/public/cpp/input_devices/input_device_client.h"
+#include "services/ui/public/interfaces/constants.mojom.h"
+#include "ui/app_list/presenter/app_list.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
+#include "ui/display/screen.h"
+#include "ui/views/examples/examples_window.h"
+
+namespace {
+
+void ShowViewsExamples() {
+ views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE);
+}
+
+class ShellInit : public ash::shell::ShellDelegateImpl,
+ public ash::ShellObserver {
+ public:
+ ShellInit() {
+ input_device_client_ = base::MakeUnique<ui::InputDeviceClient>();
+ }
+ ~ShellInit() override = default;
+
+ void set_window_manager_app(ash::mus::WindowManagerApplication* app) {
+ window_manager_app_ = app;
+ }
+
+ // ash::shell::ShellDelegateImpl:
+ void PreInit() override {
+ DCHECK(window_manager_app_->GetConnector());
+ ui::mojom::InputDeviceServerPtr server;
+ window_manager_app_->GetConnector()->BindInterface(ui::mojom::kServiceName,
+ &server);
+ input_device_client_->Connect(std::move(server));
+
+ ash::shell::ShellDelegateImpl::PreInit();
+ ash::Shell::Get()->AddShellObserver(this);
+ }
+
+ // ash::ShellObserver:
+ void OnShellInitialized() override {
+ ash::Shell::Get()->RemoveShellObserver(this);
+
+ // Initialize session controller client and create fake user sessions. The
+ // fake user sessions makes ash into the logged in state.
+ example_session_controller_client_ =
+ base::MakeUnique<ash::shell::ExampleSessionControllerClient>(
+ ash::Shell::Get()->session_controller());
+ example_session_controller_client_->Initialize();
+
+ window_watcher_ = base::MakeUnique<ash::shell::WindowWatcher>();
+ display::Screen::GetScreen()->AddObserver(window_watcher_.get());
+ ash::shell::InitWindowTypeLauncher(base::Bind(&ShowViewsExamples));
+
+ // Initialize the example app list presenter.
+ example_app_list_presenter_ =
+ base::MakeUnique<ash::shell::ExampleAppListPresenter>();
+ ash::Shell::Get()->app_list()->SetAppListPresenter(
+ example_app_list_presenter_->CreateInterfacePtrAndBind());
+
+ ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
+ }
+
+ private:
+ std::unique_ptr<ash::shell::ExampleAppListPresenter>
+ example_app_list_presenter_;
+ std::unique_ptr<ash::shell::WindowWatcher> window_watcher_;
+ std::unique_ptr<ash::shell::ExampleSessionControllerClient>
+ example_session_controller_client_;
+ std::unique_ptr<ui::InputDeviceClient> input_device_client_;
+ ash::mus::WindowManagerApplication* window_manager_app_ = nullptr;
+
+ DISALLOW_COPY_AND_ASSIGN(ShellInit);
+};
+
+} // namespace
+
+MojoResult ServiceMain(MojoHandle service_request_handle) {
+ const bool show_primary_host_on_connect = false;
+ std::unique_ptr<ShellInit> shell_init_ptr = base::MakeUnique<ShellInit>();
+ ShellInit* shell_init = shell_init_ptr.get();
+ ash::mus::WindowManagerApplication* window_manager_app =
+ new ash::mus::WindowManagerApplication(show_primary_host_on_connect,
+ ash::Config::MUS,
+ std::move(shell_init_ptr));
+ shell_init->set_window_manager_app(window_manager_app);
+ service_manager::ServiceRunner runner(window_manager_app);
+ return runner.Run(service_request_handle);
+}
« no previous file with comments | « ash/mus/standalone/manifest.json ('k') | ash/mus/test/ash_test_impl_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698