summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-01 14:47:55 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-01 14:47:55 +0000
commitbdd2d420304d257937e311f17dedca61c06711f4 (patch)
tree3678ff1cf7617c32c78af549f4abb0bf28fa1b47 /content/worker
parentc2454884f0878d17ed8096edb22cfaf3209c22ac (diff)
downloadchromium_src-bdd2d420304d257937e311f17dedca61c06711f4.zip
chromium_src-bdd2d420304d257937e311f17dedca61c06711f4.tar.gz
chromium_src-bdd2d420304d257937e311f17dedca61c06711f4.tar.bz2
Move the rest of webkit/glue into content/child
One more step towards removing src/webkit/ BUG=265753 TEST=content_shell and content_unittests R=jochen@chromium.org,jam@chromium.org TBR=darin Review URL: https://codereview.chromium.org/151023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/DEPS1
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.cc8
2 files changed, 4 insertions, 5 deletions
diff --git a/content/worker/DEPS b/content/worker/DEPS
index 619c5b7..6e9ea80 100644
--- a/content/worker/DEPS
+++ b/content/worker/DEPS
@@ -2,6 +2,5 @@ include_rules = [
"+content/child",
"+sandbox/win/src",
"+v8/include/v8.h",
- "+webkit/glue",
]
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index a83cd34..553f677 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -9,6 +9,7 @@
#include "base/message_loop/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/strings/utf_string_conversions.h"
+#include "content/child/blink_glue.h"
#include "content/child/database_util.h"
#include "content/child/fileapi/webfilesystem_impl.h"
#include "content/child/indexed_db/webidbfactory_impl.h"
@@ -17,6 +18,7 @@
#include "content/child/thread_safe_sender.h"
#include "content/child/web_database_observer_impl.h"
#include "content/child/webblobregistry_impl.h"
+#include "content/child/webfileutilities_impl.h"
#include "content/child/webmessageportchannel_impl.h"
#include "content/common/file_utilities_messages.h"
#include "content/common/mime_registry_messages.h"
@@ -28,8 +30,6 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "webkit/common/quota/quota_types.h"
-#include "webkit/glue/webfileutilities_impl.h"
-#include "webkit/glue/webkit_glue.h"
using blink::Platform;
using blink::WebBlobRegistry;
@@ -49,7 +49,7 @@ namespace content {
// TODO(kinuko): Probably this could be consolidated into
// RendererWebKitPlatformSupportImpl::FileUtilities.
class WorkerWebKitPlatformSupportImpl::FileUtilities
- : public webkit_glue::WebFileUtilitiesImpl {
+ : public WebFileUtilitiesImpl {
public:
explicit FileUtilities(ThreadSafeSender* sender)
: thread_safe_sender_(sender) {}
@@ -69,7 +69,7 @@ bool WorkerWebKitPlatformSupportImpl::FileUtilities::getFileInfo(
status != base::File::FILE_OK) {
return false;
}
- webkit_glue::FileInfoToWebFileInfo(file_info, &web_file_info);
+ FileInfoToWebFileInfo(file_info, &web_file_info);
web_file_info.platformPath = path;
return true;
}