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

Side by Side Diff: chrome/app/mash/mash_runner.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 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 unified diff | Download patch
« no previous file with comments | « chrome/app/mash/mash_runner.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "components/resource_provider/resource_provider_app.h" 18 #include "components/resource_provider/resource_provider_app.h"
19 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
20 #include "mash/browser_driver/browser_driver_application_delegate.h" 20 #include "mash/browser_driver/browser_driver_application_delegate.h"
21 #include "mash/quick_launch/quick_launch_application.h" 21 #include "mash/quick_launch/quick_launch_application.h"
22 #include "mash/session/session.h" 22 #include "mash/session/session.h"
23 #include "mash/task_viewer/task_viewer.h" 23 #include "mash/task_viewer/task_viewer.h"
24 #include "mash/wm/window_manager_application.h" 24 #include "mash/wm/window_manager_application.h"
25 #include "mojo/public/cpp/bindings/binding_set.h" 25 #include "mojo/public/cpp/bindings/binding_set.h"
26 #include "mojo/shell/background/background_shell.h" 26 #include "services/shell/background/background_shell.h"
27 #include "mojo/shell/native_runner_delegate.h" 27 #include "services/shell/native_runner_delegate.h"
28 #include "mojo/shell/public/cpp/connector.h" 28 #include "services/shell/public/cpp/connector.h"
29 #include "mojo/shell/public/cpp/identity.h" 29 #include "services/shell/public/cpp/identity.h"
30 #include "mojo/shell/public/cpp/shell_client.h" 30 #include "services/shell/public/cpp/shell_client.h"
31 #include "mojo/shell/public/cpp/shell_connection.h" 31 #include "services/shell/public/cpp/shell_connection.h"
32 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h" 32 #include "services/shell/public/interfaces/shell_client_factory.mojom.h"
33 #include "mojo/shell/runner/common/switches.h" 33 #include "services/shell/runner/common/switches.h"
34 #include "mojo/shell/runner/host/child_process_base.h" 34 #include "services/shell/runner/host/child_process_base.h"
35 35
36 #if defined(OS_LINUX) 36 #if defined(OS_LINUX)
37 #include "components/font_service/font_service_app.h" 37 #include "components/font_service/font_service_app.h"
38 #endif 38 #endif
39 39
40 using mojo::shell::mojom::ShellClientFactory; 40 using mojo::shell::mojom::ShellClientFactory;
41 41
42 namespace { 42 namespace {
43 43
44 // kProcessType used to identify child processes. 44 // kProcessType used to identify child processes.
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 scoped_ptr<base::MessageLoop> message_loop; 234 scoped_ptr<base::MessageLoop> message_loop;
235 #if defined(OS_LINUX) 235 #if defined(OS_LINUX)
236 base::AtExitManager exit_manager; 236 base::AtExitManager exit_manager;
237 #endif 237 #endif
238 if (!IsChild()) 238 if (!IsChild())
239 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI)); 239 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
240 MashRunner mash_runner; 240 MashRunner mash_runner;
241 mash_runner.Run(); 241 mash_runner.Run();
242 return 0; 242 return 0;
243 } 243 }
OLDNEW
« no previous file with comments | « chrome/app/mash/mash_runner.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698