summaryrefslogtreecommitdiffstats
path: root/chrome/browser/in_process_webkit
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 06:18:11 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 06:18:11 +0000
commit327344ef227af4c66b42cb7e948d4c4096eab83f (patch)
treee66b340b198dcd9ed8db57ae067eb9fd8d11c26b /chrome/browser/in_process_webkit
parent50220030753d7d0ba1fcea95e5f889033bdeb382 (diff)
downloadchromium_src-327344ef227af4c66b42cb7e948d4c4096eab83f.zip
chromium_src-327344ef227af4c66b42cb7e948d4c4096eab83f.tar.gz
chromium_src-327344ef227af4c66b42cb7e948d4c4096eab83f.tar.bz2
WebSocket support in chromium.
Run with --enable-web-sockets enables WebSocket features. BUG=12497 TEST=none Review URL: http://codereview.chromium.org/292044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/in_process_webkit')
-rw-r--r--chrome/browser/in_process_webkit/browser_webkitclient_impl.cc5
-rw-r--r--chrome/browser/in_process_webkit/browser_webkitclient_impl.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
index 53ced24..6a13013 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc
@@ -78,6 +78,11 @@ WebKit::WebURLLoader* BrowserWebKitClientImpl::createURLLoader() {
return NULL;
}
+WebKit::WebSocketStreamHandle* BrowserWebKitClientImpl::createSocketStreamHandle() {
+ NOTREACHED();
+ return NULL;
+}
+
void BrowserWebKitClientImpl::getPluginList(bool refresh,
WebKit::WebPluginListBuilder* builder) {
NOTREACHED();
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
index 07824db..0024bfb 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
@@ -27,6 +27,7 @@ class BrowserWebKitClientImpl : public webkit_glue::WebKitClientImpl {
virtual WebKit::WebString defaultLocale();
virtual WebKit::WebThemeEngine* themeEngine();
virtual WebKit::WebURLLoader* createURLLoader();
+ virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*);
virtual WebKit::WebData loadResource(const char* name);
virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(