OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
3 // LICENSE file. | 3 // LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "FrameView.h" | 7 #include "FrameView.h" |
8 #include "ScrollView.h" | 8 #include "ScrollView.h" |
9 #include <wtf/Assertions.h> | 9 #include <wtf/Assertions.h> |
10 #undef LOG | 10 #undef LOG |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "webkit/api/public/WebData.h" | 25 #include "webkit/api/public/WebData.h" |
26 #include "webkit/api/public/WebFrameClient.h" | 26 #include "webkit/api/public/WebFrameClient.h" |
27 #include "webkit/api/public/WebPluginListBuilder.h" | 27 #include "webkit/api/public/WebPluginListBuilder.h" |
28 #include "webkit/api/public/WebScreenInfo.h" | 28 #include "webkit/api/public/WebScreenInfo.h" |
29 #include "webkit/api/public/WebString.h" | 29 #include "webkit/api/public/WebString.h" |
30 #include "webkit/glue/chrome_client_impl.h" | 30 #include "webkit/glue/chrome_client_impl.h" |
31 #include "webkit/glue/glue_util.h" | 31 #include "webkit/glue/glue_util.h" |
32 #include "webkit/glue/plugins/plugin_instance.h" | 32 #include "webkit/glue/plugins/plugin_instance.h" |
33 #include "webkit/glue/webkit_glue.h" | 33 #include "webkit/glue/webkit_glue.h" |
34 #include "webkit/glue/webplugininfo.h" | 34 #include "webkit/glue/webplugininfo.h" |
| 35 #include "webkit/glue/websocketstreamhandle_impl.h" |
35 #include "webkit/glue/weburlloader_impl.h" | 36 #include "webkit/glue/weburlloader_impl.h" |
36 #include "webkit/glue/webview_impl.h" | 37 #include "webkit/glue/webview_impl.h" |
37 #include "webkit/glue/webworkerclient_impl.h" | 38 #include "webkit/glue/webworkerclient_impl.h" |
38 | 39 |
39 using WebKit::WebApplicationCacheHost; | 40 using WebKit::WebApplicationCacheHost; |
40 using WebKit::WebApplicationCacheHostClient; | 41 using WebKit::WebApplicationCacheHostClient; |
41 using WebKit::WebCursorInfo; | 42 using WebKit::WebCursorInfo; |
42 using WebKit::WebData; | 43 using WebKit::WebData; |
43 using WebKit::WebLocalizedString; | 44 using WebKit::WebLocalizedString; |
44 using WebKit::WebPluginListBuilder; | 45 using WebKit::WebPluginListBuilder; |
45 using WebKit::WebStorageNamespace; | 46 using WebKit::WebStorageNamespace; |
46 using WebKit::WebString; | 47 using WebKit::WebString; |
| 48 using WebKit::WebSocketStreamHandle; |
47 using WebKit::WebThemeEngine; | 49 using WebKit::WebThemeEngine; |
48 using WebKit::WebURLLoader; | 50 using WebKit::WebURLLoader; |
49 using WebKit::WebWidgetClient; | 51 using WebKit::WebWidgetClient; |
50 | 52 |
51 namespace { | 53 namespace { |
52 | 54 |
53 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) { | 55 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) { |
54 WebCore::FrameView* view; | 56 WebCore::FrameView* view; |
55 if (widget->isFrameView()) { | 57 if (widget->isFrameView()) { |
56 view = static_cast<WebCore::FrameView*>(widget); | 58 view = static_cast<WebCore::FrameView*>(widget); |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 return &theme_engine_; | 147 return &theme_engine_; |
146 #else | 148 #else |
147 return NULL; | 149 return NULL; |
148 #endif | 150 #endif |
149 } | 151 } |
150 | 152 |
151 WebURLLoader* WebKitClientImpl::createURLLoader() { | 153 WebURLLoader* WebKitClientImpl::createURLLoader() { |
152 return new WebURLLoaderImpl(); | 154 return new WebURLLoaderImpl(); |
153 } | 155 } |
154 | 156 |
| 157 WebSocketStreamHandle* WebKitClientImpl::createSocketStreamHandle() { |
| 158 return new WebSocketStreamHandleImpl(); |
| 159 } |
| 160 |
155 void WebKitClientImpl::getPluginList(bool refresh, | 161 void WebKitClientImpl::getPluginList(bool refresh, |
156 WebPluginListBuilder* builder) { | 162 WebPluginListBuilder* builder) { |
157 std::vector<WebPluginInfo> plugins; | 163 std::vector<WebPluginInfo> plugins; |
158 GetPlugins(refresh, &plugins); | 164 GetPlugins(refresh, &plugins); |
159 | 165 |
160 for (size_t i = 0; i < plugins.size(); ++i) { | 166 for (size_t i = 0; i < plugins.size(); ++i) { |
161 const WebPluginInfo& plugin = plugins[i]; | 167 const WebPluginInfo& plugin = plugins[i]; |
162 | 168 |
163 builder->addPlugin( | 169 builder->addPlugin( |
164 WideToUTF16Hack(plugin.name), | 170 WideToUTF16Hack(plugin.name), |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 return file_util::DirectoryExists(file_path); | 500 return file_util::DirectoryExists(file_path); |
495 } | 501 } |
496 | 502 |
497 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { | 503 WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) { |
498 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); | 504 FilePath file_path(webkit_glue::WebStringToFilePathString(path)); |
499 GURL file_url = net::FilePathToFileURL(file_path); | 505 GURL file_url = net::FilePathToFileURL(file_path); |
500 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); | 506 return webkit_glue::KURLToWebURL(webkit_glue::GURLToKURL(file_url)); |
501 } | 507 } |
502 | 508 |
503 } // namespace webkit_glue | 509 } // namespace webkit_glue |
OLD | NEW |