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

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

Issue 2390013002: Rename mojo: to service: (Closed)
Patch Set: . Created 4 years, 2 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/BUILD.gn ('k') | chrome/app/mojo/chrome_manifest.json » ('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 "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 NativeRunnerDelegateImpl native_runner_delegate; 120 NativeRunnerDelegateImpl native_runner_delegate;
121 shell::BackgroundShell background_shell; 121 shell::BackgroundShell background_shell;
122 std::unique_ptr<shell::BackgroundShell::InitParams> init_params( 122 std::unique_ptr<shell::BackgroundShell::InitParams> init_params(
123 new shell::BackgroundShell::InitParams); 123 new shell::BackgroundShell::InitParams);
124 init_params->native_runner_delegate = &native_runner_delegate; 124 init_params->native_runner_delegate = &native_runner_delegate;
125 background_shell.Init(std::move(init_params)); 125 background_shell.Init(std::move(init_params));
126 service_.reset(new mash::MashPackagedService); 126 service_.reset(new mash::MashPackagedService);
127 service_->set_context(base::MakeUnique<shell::ServiceContext>( 127 service_->set_context(base::MakeUnique<shell::ServiceContext>(
128 service_.get(), 128 service_.get(),
129 background_shell.CreateServiceRequest("exe:chrome_mash"))); 129 background_shell.CreateServiceRequest("exe:chrome_mash")));
130 service_->connector()->Connect("mojo:mash_session"); 130 service_->connector()->Connect("service:mash_session");
131 base::RunLoop().Run(); 131 base::RunLoop().Run();
132 } 132 }
133 133
134 void MashRunner::RunChild() { 134 void MashRunner::RunChild() {
135 base::i18n::InitializeICU(); 135 base::i18n::InitializeICU();
136 InitializeResources(); 136 InitializeResources();
137 shell::ChildProcessMainWithCallback( 137 shell::ChildProcessMainWithCallback(
138 base::Bind(&MashRunner::StartChildApp, base::Unretained(this))); 138 base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
139 } 139 }
140 140
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 tracing::GetConfigForTraceToConsole(); 178 tracing::GetConfigForTraceToConsole();
179 base::trace_event::TraceLog::GetInstance()->SetEnabled( 179 base::trace_event::TraceLog::GetInstance()->SetEnabled(
180 trace_config, 180 trace_config,
181 base::trace_event::TraceLog::RECORDING_MODE); 181 base::trace_event::TraceLog::RECORDING_MODE);
182 } 182 }
183 183
184 MashRunner mash_runner; 184 MashRunner mash_runner;
185 mash_runner.Run(); 185 mash_runner.Run();
186 return 0; 186 return 0;
187 } 187 }
OLDNEW
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/app/mojo/chrome_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698