| Index: chrome/plugin/webplugin_delegate_stub.cc
|
| ===================================================================
|
| --- chrome/plugin/webplugin_delegate_stub.cc (revision 78225)
|
| +++ chrome/plugin/webplugin_delegate_stub.cc (working copy)
|
| @@ -7,12 +7,12 @@
|
| #include "build/build_config.h"
|
|
|
| #include "base/command_line.h"
|
| -#include "chrome/common/child_process_logging.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/plugin/npobject_stub.h"
|
| #include "chrome/plugin/plugin_channel.h"
|
| #include "chrome/plugin/plugin_thread.h"
|
| #include "chrome/plugin/webplugin_proxy.h"
|
| +#include "content/common/content_client.h"
|
| #include "content/common/plugin_messages.h"
|
| #include "third_party/npapi/bindings/npapi.h"
|
| #include "third_party/npapi/bindings/npruntime.h"
|
| @@ -66,7 +66,7 @@
|
|
|
| WebPluginDelegateStub::~WebPluginDelegateStub() {
|
| in_destructor_ = true;
|
| - child_process_logging::SetActiveURL(page_url_);
|
| + content::GetContentClient()->SetActiveURL(page_url_);
|
|
|
| if (channel_->in_send()) {
|
| // The delegate or an npobject is in the callstack, so don't delete it
|
| @@ -83,7 +83,7 @@
|
| }
|
|
|
| bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
|
| - child_process_logging::SetActiveURL(page_url_);
|
| + content::GetContentClient()->SetActiveURL(page_url_);
|
|
|
| // A plugin can execute a script to delete itself in any of its NPP methods.
|
| // Hold an extra reference to ourself so that if this does occur and we're
|
| @@ -154,7 +154,7 @@
|
| void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
|
| bool* result) {
|
| page_url_ = params.page_url;
|
| - child_process_logging::SetActiveURL(page_url_);
|
| + content::GetContentClient()->SetActiveURL(page_url_);
|
|
|
| *result = false;
|
| if (params.arg_names.size() != params.arg_values.size()) {
|
|
|