| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/app/mash/mash_runner.h" | 5 #include "chrome/app/mash/mash_runner.h" |
| 6 | 6 |
| 7 #include "ash/mus/sysui_application.h" | 7 #include "ash/mus/sysui_application.h" |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/debug/debugger.h" | 11 #include "base/debug/debugger.h" |
| 12 #include "base/i18n/icu_util.h" | 12 #include "base/i18n/icu_util.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
| 15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
| 16 #include "base/process/launch.h" | 16 #include "base/process/launch.h" |
| 17 #include "components/mus/mus_app.h" | 17 #include "components/mus/mus_app.h" |
| 18 #include "content/public/common/content_switches.h" | 18 #include "content/public/common/content_switches.h" |
| 19 #include "mash/browser_driver/browser_driver_application_delegate.h" | 19 #include "mash/app_driver/app_driver_application_delegate.h" |
| 20 #include "mash/quick_launch/quick_launch_application.h" | 20 #include "mash/quick_launch/quick_launch_application.h" |
| 21 #include "mash/session/session.h" | 21 #include "mash/session/session.h" |
| 22 #include "mash/task_viewer/task_viewer.h" | 22 #include "mash/task_viewer/task_viewer.h" |
| 23 #include "mash/wm/window_manager_application.h" | 23 #include "mash/wm/window_manager_application.h" |
| 24 #include "mojo/public/cpp/bindings/binding_set.h" | 24 #include "mojo/public/cpp/bindings/binding_set.h" |
| 25 #include "services/shell/background/background_shell.h" | 25 #include "services/shell/background/background_shell.h" |
| 26 #include "services/shell/native_runner_delegate.h" | 26 #include "services/shell/native_runner_delegate.h" |
| 27 #include "services/shell/public/cpp/connector.h" | 27 #include "services/shell/public/cpp/connector.h" |
| 28 #include "services/shell/public/cpp/identity.h" | 28 #include "services/shell/public/cpp/identity.h" |
| 29 #include "services/shell/public/cpp/shell_client.h" | 29 #include "services/shell/public/cpp/shell_client.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 if (name == "mojo:mus") | 93 if (name == "mojo:mus") |
| 94 return base::WrapUnique(new mus::MusApp); | 94 return base::WrapUnique(new mus::MusApp); |
| 95 if (name == "mojo:quick_launch") | 95 if (name == "mojo:quick_launch") |
| 96 return base::WrapUnique(new mash::quick_launch::QuickLaunchApplication); | 96 return base::WrapUnique(new mash::quick_launch::QuickLaunchApplication); |
| 97 if (name == "mojo:task_viewer") | 97 if (name == "mojo:task_viewer") |
| 98 return base::WrapUnique(new mash::task_viewer::TaskViewer); | 98 return base::WrapUnique(new mash::task_viewer::TaskViewer); |
| 99 #if defined(OS_LINUX) | 99 #if defined(OS_LINUX) |
| 100 if (name == "mojo:font_service") | 100 if (name == "mojo:font_service") |
| 101 return base::WrapUnique(new font_service::FontServiceApp); | 101 return base::WrapUnique(new font_service::FontServiceApp); |
| 102 #endif | 102 #endif |
| 103 if (name == "mojo:browser_driver") { | 103 if (name == "mojo:app_driver") { |
| 104 return base::WrapUnique( | 104 return base::WrapUnique( |
| 105 new mash::browser_driver::BrowserDriverApplicationDelegate()); | 105 new mash::app_driver::AppDriverApplicationDelegate()); |
| 106 } | 106 } |
| 107 return nullptr; | 107 return nullptr; |
| 108 } | 108 } |
| 109 | 109 |
| 110 mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_; | 110 mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_; |
| 111 std::unique_ptr<shell::ShellClient> shell_client_; | 111 std::unique_ptr<shell::ShellClient> shell_client_; |
| 112 std::unique_ptr<shell::ShellConnection> shell_connection_; | 112 std::unique_ptr<shell::ShellConnection> shell_connection_; |
| 113 | 113 |
| 114 DISALLOW_COPY_AND_ASSIGN(DefaultShellClient); | 114 DISALLOW_COPY_AND_ASSIGN(DefaultShellClient); |
| 115 }; | 115 }; |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 std::unique_ptr<base::MessageLoop> message_loop; | 229 std::unique_ptr<base::MessageLoop> message_loop; |
| 230 #if defined(OS_LINUX) | 230 #if defined(OS_LINUX) |
| 231 base::AtExitManager exit_manager; | 231 base::AtExitManager exit_manager; |
| 232 #endif | 232 #endif |
| 233 if (!IsChild()) | 233 if (!IsChild()) |
| 234 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI)); | 234 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI)); |
| 235 MashRunner mash_runner; | 235 MashRunner mash_runner; |
| 236 mash_runner.Run(); | 236 mash_runner.Run(); |
| 237 return 0; | 237 return 0; |
| 238 } | 238 } |
| OLD | NEW |