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

Unified Diff: content/browser/gpu/gpu_process_host.cc

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
Patch Set: . Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/mojo/mojo_child_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_process_host.cc
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 9007810264791ec2401d7ad3b59ff3d47410df6c..dc2707091adb658ea7ec34b7cd7860bf8a2a3404 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -570,7 +570,7 @@ bool GpuProcessHost::Init() {
in_process_gpu_thread_.reset(g_gpu_main_thread_factory(
InProcessChildThreadParams(
channel_id, base::ThreadTaskRunnerHandle::Get(), std::string(),
- mojo_child_connection_->shell_client_token()),
+ mojo_child_connection_->service_token()),
gpu_preferences));
base::Thread::Options options;
#if defined(OS_WIN)
@@ -994,7 +994,7 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id,
cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kGpuProcess);
cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
cmd_line->AppendSwitchASCII(switches::kMojoApplicationChannelToken,
- mojo_child_connection_->shell_client_token());
+ mojo_child_connection_->service_token());
BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(cmd_line);
#if defined(OS_WIN)
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/mojo/mojo_child_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698