summaryrefslogtreecommitdiffstats
path: root/content/utility
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 05:42:36 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-22 05:42:36 +0000
commit0157282494c1096cef55f04d7b8936c7db022679 (patch)
tree33d30478c95e60b4ba629b098db06ae2d1418278 /content/utility
parent745816be61e207da7cef1f839591bfb35bd15fd3 (diff)
downloadchromium_src-0157282494c1096cef55f04d7b8936c7db022679.zip
chromium_src-0157282494c1096cef55f04d7b8936c7db022679.tar.gz
chromium_src-0157282494c1096cef55f04d7b8936c7db022679.tar.bz2
Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods
This moves the functions into a pattern that is component-friendly. BUG=98755 TEST=chrome test_shell test_shell_tests browser_tests DumpRenderTree Review URL: http://codereview.chromium.org/8602002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
-rw-r--r--content/utility/utility_thread_impl.cc4
-rw-r--r--content/utility/utility_thread_impl.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index 93b906d..e909224 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -12,12 +12,12 @@
#include "content/common/child_process_messages.h"
#include "content/common/indexed_db_key.h"
#include "content/common/utility_messages.h"
+#include "content/common/webkitplatformsupport_impl.h"
#include "content/public/utility/content_utility_client.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
#include "webkit/glue/idb_bindings.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
#include "webkit/plugins/npapi/plugin_list.h"
namespace {
@@ -34,7 +34,7 @@ void ConvertVector(const SRC& src, DEST* dest) {
UtilityThreadImpl::UtilityThreadImpl()
: batch_mode_(false) {
ChildProcess::current()->AddRefProcess();
- webkit_platform_support_.reset(new webkit_glue::WebKitPlatformSupportImpl);
+ webkit_platform_support_.reset(new content::WebKitPlatformSupportImpl);
WebKit::initialize(webkit_platform_support_.get());
content::GetContentClient()->utility()->UtilityThreadStarted();
}
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h
index 6facec1..b0c20a2 100644
--- a/content/utility/utility_thread_impl.h
+++ b/content/utility/utility_thread_impl.h
@@ -21,9 +21,6 @@ class IndexedDBKey;
namespace content {
class SerializedScriptValue;
-}
-
-namespace webkit_glue {
class WebKitPlatformSupportImpl;
}
@@ -64,7 +61,7 @@ class UtilityThreadImpl : public content::UtilityThread,
// True when we're running in batch mode.
bool batch_mode_;
- scoped_ptr<webkit_glue::WebKitPlatformSupportImpl> webkit_platform_support_;
+ scoped_ptr<content::WebKitPlatformSupportImpl> webkit_platform_support_;
DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl);
};