summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authordslomov@chromium.org <dslomov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 00:21:46 +0000
committerdslomov@chromium.org <dslomov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 00:21:46 +0000
commit2b62c8e97d4810ab3a2346c84c79682a6eb630fa (patch)
treedd5453589bf8b6f6a616e7ac9451d0291bb4c3c0 /content
parent780c225e480bf4d5cebc731cd6dfe754e6c987b4 (diff)
downloadchromium_src-2b62c8e97d4810ab3a2346c84c79682a6eb630fa.zip
chromium_src-2b62c8e97d4810ab3a2346c84c79682a6eb630fa.tar.gz
chromium_src-2b62c8e97d4810ab3a2346c84c79682a6eb630fa.tar.bz2
Remove references to WebKit::WebWorker
Review URL: http://codereview.chromium.org/9148082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_view_impl.cc1
-rw-r--r--content/worker/websharedworkerclient_proxy.cc13
-rw-r--r--content/worker/websharedworkerclient_proxy.h5
3 files changed, 1 insertions, 18 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 1fb37fe..dedaf5e 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -246,7 +246,6 @@ using WebKit::WebVector;
using WebKit::WebView;
using WebKit::WebWidget;
using WebKit::WebWindowFeatures;
-using WebKit::WebWorker;
using appcache::WebApplicationCacheHostImpl;
using base::Time;
using base::TimeDelta;
diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc
index df0ddbf..bcc20c2 100644
--- a/content/worker/websharedworkerclient_proxy.cc
+++ b/content/worker/websharedworkerclient_proxy.cc
@@ -12,10 +12,6 @@
#include "content/common/webmessageportchannel_impl.h"
#include "content/common/worker_messages.h"
#include "content/public/common/content_switches.h"
-// TODO(jam): uncomment this and WebSharedWorkerClientProxy::createWorker
-// when the renderer worker code moves to content. This code isn't used
-// now since we don't support nested workers anyways.
-//#include "content/renderer/webworker_proxy.h"
#include "content/worker/shared_worker_devtools_agent.h"
#include "content/worker/websharedworker_stub.h"
#include "content/worker/worker_thread.h"
@@ -27,7 +23,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h"
using WebKit::WebApplicationCacheHost;
using WebKit::WebFrame;
@@ -119,14 +114,6 @@ void WebSharedWorkerClientProxy::workerContextDestroyed() {
stub_->Shutdown();
}
-WebKit::WebWorker* WebSharedWorkerClientProxy::createWorker(
- WebKit::WebSharedWorkerClient* client) {
- // TODO(jam): see comment at top of file
- //return new WebWorkerProxy(client, WorkerThread::current(),
- // 0, appcache_host_id_);
- return NULL;
-}
-
WebKit::WebNotificationPresenter*
WebSharedWorkerClientProxy::notificationPresenter() {
// TODO(johnnyg): Notifications are not yet hooked up to workers.
diff --git a/content/worker/websharedworkerclient_proxy.h b/content/worker/websharedworkerclient_proxy.h
index 9d6891cd..6b085c5 100644
--- a/content/worker/websharedworkerclient_proxy.h
+++ b/content/worker/websharedworkerclient_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -16,7 +16,6 @@ namespace WebKit {
class WebApplicationCacheHost;
class WebApplicationCacheHostClient;
class WebFrame;
-class WebWorker;
}
class SharedWorkerDevToolsAgent;
@@ -63,8 +62,6 @@ class WebSharedWorkerClientProxy : public WebKit::WebSharedWorkerClient {
virtual void reportPendingActivity(bool has_pending_activity);
virtual void workerContextClosed();
virtual void workerContextDestroyed();
- virtual WebKit::WebWorker* createWorker(
- WebKit::WebSharedWorkerClient* client);
virtual WebKit::WebNotificationPresenter* notificationPresenter();