OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/ppapi_plugin/ppapi_thread.h" | 5 #include "content/ppapi_plugin/ppapi_thread.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); | 398 base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); |
399 } | 399 } |
400 | 400 |
401 bool PpapiThread::SetupRendererChannel(base::ProcessId renderer_pid, | 401 bool PpapiThread::SetupRendererChannel(base::ProcessId renderer_pid, |
402 int renderer_child_id, | 402 int renderer_child_id, |
403 bool incognito, | 403 bool incognito, |
404 IPC::ChannelHandle* handle) { | 404 IPC::ChannelHandle* handle) { |
405 DCHECK(is_broker_ == (connect_instance_func_ != NULL)); | 405 DCHECK(is_broker_ == (connect_instance_func_ != NULL)); |
406 IPC::ChannelHandle plugin_handle; | 406 IPC::ChannelHandle plugin_handle; |
407 plugin_handle.name = IPC::Channel::GenerateVerifiedChannelID( | 407 plugin_handle.name = IPC::Channel::GenerateVerifiedChannelID( |
408 StringPrintf("%d.r%d", base::GetCurrentProcId(), renderer_child_id)); | 408 base::StringPrintf( |
| 409 "%d.r%d", base::GetCurrentProcId(), renderer_child_id)); |
409 | 410 |
410 ppapi::proxy::ProxyChannel* dispatcher = NULL; | 411 ppapi::proxy::ProxyChannel* dispatcher = NULL; |
411 bool init_result = false; | 412 bool init_result = false; |
412 if (is_broker_) { | 413 if (is_broker_) { |
413 BrokerProcessDispatcher* broker_dispatcher = | 414 BrokerProcessDispatcher* broker_dispatcher = |
414 new BrokerProcessDispatcher(plugin_entry_points_.get_interface, | 415 new BrokerProcessDispatcher(plugin_entry_points_.get_interface, |
415 connect_instance_func_); | 416 connect_instance_func_); |
416 init_result = broker_dispatcher->InitBrokerWithChannel(this, | 417 init_result = broker_dispatcher->InitBrokerWithChannel(this, |
417 renderer_pid, | 418 renderer_pid, |
418 plugin_handle, | 419 plugin_handle, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
456 | 457 |
457 // plugin() is NULL when in-process. Which is fine, because this is | 458 // plugin() is NULL when in-process. Which is fine, because this is |
458 // just a hook for setting the process name. | 459 // just a hook for setting the process name. |
459 if (GetContentClient()->plugin()) { | 460 if (GetContentClient()->plugin()) { |
460 GetContentClient()->plugin()->PluginProcessStarted( | 461 GetContentClient()->plugin()->PluginProcessStarted( |
461 path.BaseName().RemoveExtension().LossyDisplayName()); | 462 path.BaseName().RemoveExtension().LossyDisplayName()); |
462 } | 463 } |
463 } | 464 } |
464 | 465 |
465 } // namespace content | 466 } // namespace content |
OLD | NEW |