| Index: content/renderer/shared_worker/embedded_shared_worker_devtools_agent.cc
|
| diff --git a/content/worker/shared_worker_devtools_agent.cc b/content/renderer/shared_worker/embedded_shared_worker_devtools_agent.cc
|
| similarity index 49%
|
| copy from content/worker/shared_worker_devtools_agent.cc
|
| copy to content/renderer/shared_worker/embedded_shared_worker_devtools_agent.cc
|
| index 733dae1ef7a9731fabc74bb7f0b851dea7a76b39..0448dad99238adb3e8a17bf89a94ebe203ff9804 100644
|
| --- a/content/worker/shared_worker_devtools_agent.cc
|
| +++ b/content/renderer/shared_worker/embedded_shared_worker_devtools_agent.cc
|
| @@ -1,34 +1,30 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/worker/shared_worker_devtools_agent.h"
|
| +#include "content/renderer/shared_worker/embedded_shared_worker_devtools_agent.h"
|
|
|
| #include "content/common/devtools_messages.h"
|
| -#include "content/worker/worker_thread.h"
|
| -#include "third_party/WebKit/public/platform/WebCString.h"
|
| -#include "third_party/WebKit/public/platform/WebString.h"
|
| +#include "content/renderer/render_thread_impl.h"
|
| #include "third_party/WebKit/public/web/WebSharedWorker.h"
|
|
|
| -using blink::WebSharedWorker;
|
| -using blink::WebString;
|
| -
|
| namespace content {
|
|
|
| -SharedWorkerDevToolsAgent::SharedWorkerDevToolsAgent(
|
| +EmbeddedSharedWorkerDevToolsAgent::EmbeddedSharedWorkerDevToolsAgent(
|
| int route_id,
|
| - WebSharedWorker* webworker)
|
| + blink::WebSharedWorker* webworker)
|
| : route_id_(route_id),
|
| webworker_(webworker) {
|
| }
|
|
|
| -SharedWorkerDevToolsAgent::~SharedWorkerDevToolsAgent() {
|
| +EmbeddedSharedWorkerDevToolsAgent::~EmbeddedSharedWorkerDevToolsAgent() {
|
| }
|
|
|
| // Called on the Worker thread.
|
| -bool SharedWorkerDevToolsAgent::OnMessageReceived(const IPC::Message& message) {
|
| +bool EmbeddedSharedWorkerDevToolsAgent::OnMessageReceived(
|
| + const IPC::Message& message) {
|
| bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(SharedWorkerDevToolsAgent, message)
|
| + IPC_BEGIN_MESSAGE_MAP(EmbeddedSharedWorkerDevToolsAgent, message)
|
| IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
|
| IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach)
|
| IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
|
| @@ -43,46 +39,45 @@ bool SharedWorkerDevToolsAgent::OnMessageReceived(const IPC::Message& message) {
|
| return handled;
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::SendDevToolsMessage(
|
| +void EmbeddedSharedWorkerDevToolsAgent::SendDevToolsMessage(
|
| const blink::WebString& message) {
|
| - Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(
|
| - route_id_,
|
| - message.utf8()));
|
| + Send(new DevToolsClientMsg_DispatchOnInspectorFrontend(route_id_,
|
| + message.utf8()));
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::SaveDevToolsAgentState(
|
| +void EmbeddedSharedWorkerDevToolsAgent::SaveDevToolsAgentState(
|
| const blink::WebString& state) {
|
| Send(new DevToolsHostMsg_SaveAgentRuntimeState(route_id_,
|
| state.utf8()));
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::OnAttach() {
|
| +void EmbeddedSharedWorkerDevToolsAgent::OnAttach() {
|
| webworker_->attachDevTools();
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::OnReattach(const std::string& state) {
|
| - webworker_->reattachDevTools(WebString::fromUTF8(state));
|
| +void EmbeddedSharedWorkerDevToolsAgent::OnReattach(const std::string& state) {
|
| + webworker_->reattachDevTools(blink::WebString::fromUTF8(state));
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::OnDetach() {
|
| +void EmbeddedSharedWorkerDevToolsAgent::OnDetach() {
|
| webworker_->detachDevTools();
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::OnDispatchOnInspectorBackend(
|
| +void EmbeddedSharedWorkerDevToolsAgent::OnDispatchOnInspectorBackend(
|
| const std::string& message) {
|
| - webworker_->dispatchDevToolsMessage(WebString::fromUTF8(message));
|
| + webworker_->dispatchDevToolsMessage(blink::WebString::fromUTF8(message));
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::OnPauseWorkerContextOnStart() {
|
| +void EmbeddedSharedWorkerDevToolsAgent::OnPauseWorkerContextOnStart() {
|
| webworker_->pauseWorkerContextOnStart();
|
| }
|
|
|
| -void SharedWorkerDevToolsAgent::OnResumeWorkerContext() {
|
| +void EmbeddedSharedWorkerDevToolsAgent::OnResumeWorkerContext() {
|
| webworker_->resumeWorkerContext();
|
| }
|
|
|
| -bool SharedWorkerDevToolsAgent::Send(IPC::Message* message) {
|
| - return WorkerThread::current()->Send(message);
|
| +bool EmbeddedSharedWorkerDevToolsAgent::Send(IPC::Message* message) {
|
| + return RenderThreadImpl::current()->Send(message);
|
| }
|
|
|
| } // namespace content
|
|
|