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

Side by Side Diff: services/shell/runner/host/in_process_native_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 | « services/shell/runner/child/manifest.json ('k') | services/shell/service_manager.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "services/shell/runner/host/in_process_native_runner.h" 5 #include "services/shell/runner/host/in_process_native_runner.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 DCHECK(!request_.is_pending()); 46 DCHECK(!request_.is_pending());
47 mojom::ServicePtr client; 47 mojom::ServicePtr client;
48 request_ = GetProxy(&client); 48 request_ = GetProxy(&client);
49 49
50 DCHECK(app_completed_callback_runner_.is_null()); 50 DCHECK(app_completed_callback_runner_.is_null());
51 app_completed_callback_runner_ = base::Bind( 51 app_completed_callback_runner_ = base::Bind(
52 &base::TaskRunner::PostTask, base::ThreadTaskRunnerHandle::Get(), 52 &base::TaskRunner::PostTask, base::ThreadTaskRunnerHandle::Get(),
53 FROM_HERE, app_completed_callback); 53 FROM_HERE, app_completed_callback);
54 54
55 DCHECK(!thread_); 55 DCHECK(!thread_);
56 std::string thread_name = "mojo:app_thread"; 56 std::string thread_name = "Service Thread";
57 #if defined(OS_WIN) 57 #if defined(OS_WIN)
58 thread_name = base::WideToUTF8(app_path_.BaseName().value()); 58 thread_name = base::WideToUTF8(app_path_.BaseName().value());
59 #endif 59 #endif
60 thread_.reset(new base::DelegateSimpleThread(this, thread_name)); 60 thread_.reset(new base::DelegateSimpleThread(this, thread_name));
61 thread_->Start(); 61 thread_->Start();
62 pid_available_callback.Run(base::Process::Current().Pid()); 62 pid_available_callback.Run(base::Process::Current().Pid());
63 63
64 return client; 64 return client;
65 } 65 }
66 66
(...skipping 19 matching lines...) Expand all
86 const base::FilePath& app_path) { 86 const base::FilePath& app_path) {
87 // Non-Mojo apps are always run in a new process. 87 // Non-Mojo apps are always run in a new process.
88 if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".library"))) { 88 if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".library"))) {
89 return base::MakeUnique<OutOfProcessNativeRunner>(launch_process_runner_, 89 return base::MakeUnique<OutOfProcessNativeRunner>(launch_process_runner_,
90 nullptr); 90 nullptr);
91 } 91 }
92 return base::WrapUnique(new InProcessNativeRunner); 92 return base::WrapUnique(new InProcessNativeRunner);
93 } 93 }
94 94
95 } // namespace shell 95 } // namespace shell
OLDNEW
« no previous file with comments | « services/shell/runner/child/manifest.json ('k') | services/shell/service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698