summaryrefslogtreecommitdiffstats
path: root/content/browser/in_process_webkit/webkit_thread.cc
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 10:05:19 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 10:05:19 +0000
commit8d6cba4c551a773707f441d5f2955948ba6b2450 (patch)
treeaaad1b50f3fb696c4f39a4dc078149b7560b8160 /content/browser/in_process_webkit/webkit_thread.cc
parent927a672386c66a29f84f622e1d1fa2f42a45be3b (diff)
downloadchromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.zip
chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.tar.gz
chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.tar.bz2
Update Chrome to use WebKitPlatformSupport instead of WebKitClient.
Review URL: http://codereview.chromium.org/7831035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/in_process_webkit/webkit_thread.cc')
-rw-r--r--content/browser/in_process_webkit/webkit_thread.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc
index 0613339..b9e1156 100644
--- a/content/browser/in_process_webkit/webkit_thread.cc
+++ b/content/browser/in_process_webkit/webkit_thread.cc
@@ -5,7 +5,7 @@
#include "content/browser/in_process_webkit/webkit_thread.h"
#include "base/command_line.h"
-#include "content/browser/in_process_webkit/browser_webkitclient_impl.h"
+#include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h"
#include "content/common/content_switches.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
@@ -45,9 +45,9 @@ WebKitThread::InternalWebKitThread::~InternalWebKitThread() {
}
void WebKitThread::InternalWebKitThread::Init() {
- DCHECK(!webkit_client_.get());
- webkit_client_.reset(new BrowserWebKitClientImpl);
- WebKit::initialize(webkit_client_.get());
+ DCHECK(!webkit_platform_support_.get());
+ webkit_platform_support_.reset(new BrowserWebKitPlatformSupportImpl);
+ WebKit::initialize(webkit_platform_support_.get());
webkit_glue::EnableWebCoreLogChannels(
CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kWebCoreLogChannels));
@@ -61,6 +61,6 @@ void WebKitThread::InternalWebKitThread::Init() {
}
void WebKitThread::InternalWebKitThread::CleanUp() {
- DCHECK(webkit_client_.get());
+ DCHECK(webkit_platform_support_.get());
WebKit::shutdown();
}