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

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

Issue 1769163002: Add a instance groups to Connect(), and introduce an Identity struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 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 | « ash/mus/sysui_application.cc ('k') | components/filesystem/file_system_app.h » ('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/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/process/launch.h" 15 #include "base/process/launch.h"
16 #include "components/mus/mus_app.h" 16 #include "components/mus/mus_app.h"
17 #include "components/resource_provider/resource_provider_app.h" 17 #include "components/resource_provider/resource_provider_app.h"
18 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
19 #include "mash/quick_launch/quick_launch_application.h" 19 #include "mash/quick_launch/quick_launch_application.h"
20 #include "mash/shell/shell_application_delegate.h" 20 #include "mash/shell/shell_application_delegate.h"
21 #include "mash/wm/window_manager_application.h" 21 #include "mash/wm/window_manager_application.h"
22 #include "mojo/public/cpp/bindings/binding_set.h" 22 #include "mojo/public/cpp/bindings/binding_set.h"
23 #include "mojo/shell/background/background_shell.h" 23 #include "mojo/shell/background/background_shell.h"
24 #include "mojo/shell/identity.h"
25 #include "mojo/shell/native_runner_delegate.h" 24 #include "mojo/shell/native_runner_delegate.h"
26 #include "mojo/shell/public/cpp/connector.h" 25 #include "mojo/shell/public/cpp/connector.h"
26 #include "mojo/shell/public/cpp/identity.h"
27 #include "mojo/shell/public/cpp/shell_client.h" 27 #include "mojo/shell/public/cpp/shell_client.h"
28 #include "mojo/shell/public/cpp/shell_connection.h" 28 #include "mojo/shell/public/cpp/shell_connection.h"
29 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h" 29 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
30 #include "mojo/shell/runner/common/switches.h" 30 #include "mojo/shell/runner/common/switches.h"
31 #include "mojo/shell/runner/host/child_process_base.h" 31 #include "mojo/shell/runner/host/child_process_base.h"
32 32
33 #if defined(OS_LINUX) 33 #if defined(OS_LINUX)
34 #include "components/font_service/font_service_app.h" 34 #include "components/font_service/font_service_app.h"
35 #endif 35 #endif
36 36
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 130
131 class NativeRunnerDelegateImpl : public mojo::shell::NativeRunnerDelegate { 131 class NativeRunnerDelegateImpl : public mojo::shell::NativeRunnerDelegate {
132 public: 132 public:
133 NativeRunnerDelegateImpl() {} 133 NativeRunnerDelegateImpl() {}
134 ~NativeRunnerDelegateImpl() override {} 134 ~NativeRunnerDelegateImpl() override {}
135 135
136 private: 136 private:
137 // mojo::shell::NativeRunnerDelegate: 137 // mojo::shell::NativeRunnerDelegate:
138 void AdjustCommandLineArgumentsForTarget( 138 void AdjustCommandLineArgumentsForTarget(
139 const mojo::shell::Identity& target, 139 const mojo::Identity& target,
140 base::CommandLine* command_line) override { 140 base::CommandLine* command_line) override {
141 if (target.name() != "exe:chrome") { 141 if (target.name() != "exe:chrome") {
142 if (target.name() == "exe:chrome_mash") 142 if (target.name() == "exe:chrome_mash")
143 ChangeChromeMashToChrome(command_line); 143 ChangeChromeMashToChrome(command_line);
144 command_line->AppendSwitchASCII(switches::kProcessType, kMashChild); 144 command_line->AppendSwitchASCII(switches::kProcessType, kMashChild);
145 #if defined(OS_WIN) 145 #if defined(OS_WIN)
146 command_line->AppendArg(switches::kPrefetchArgumentOther); 146 command_line->AppendArg(switches::kPrefetchArgumentOther);
147 #endif 147 #endif
148 return; 148 return;
149 } 149 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 scoped_ptr<base::MessageLoop> message_loop; 225 scoped_ptr<base::MessageLoop> message_loop;
226 #if defined(OS_LINUX) 226 #if defined(OS_LINUX)
227 base::AtExitManager exit_manager; 227 base::AtExitManager exit_manager;
228 #endif 228 #endif
229 if (!IsChild()) 229 if (!IsChild())
230 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI)); 230 message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
231 MashRunner mash_runner; 231 MashRunner mash_runner;
232 mash_runner.Run(); 232 mash_runner.Run();
233 return 0; 233 return 0;
234 } 234 }
OLDNEW
« no previous file with comments | « ash/mus/sysui_application.cc ('k') | components/filesystem/file_system_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698