OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/support/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug_util.h" | 9 #include "base/debug_util.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/i18n/icu_util.h" | 12 #include "base/i18n/icu_util.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "base/process_util.h" | 15 #include "base/process_util.h" |
16 #include "base/sys_string_conversions.h" | 16 #include "base/sys_string_conversions.h" |
17 #include "base/utf_string_conversions.h" | 17 #include "base/utf_string_conversions.h" |
18 #include "base/weak_ptr.h" | 18 #include "base/weak_ptr.h" |
19 #include "net/base/net_util.h" | 19 #include "net/base/net_util.h" |
20 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" | 20 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
| 21 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h" |
21 #include "webkit/appcache/web_application_cache_host_impl.h" | 22 #include "webkit/appcache/web_application_cache_host_impl.h" |
22 #include "webkit/glue/media/buffered_data_source.h" | 23 #include "webkit/glue/media/buffered_data_source.h" |
23 #include "webkit/glue/media/media_resource_loader_bridge_factory.h" | 24 #include "webkit/glue/media/media_resource_loader_bridge_factory.h" |
24 #include "webkit/glue/media/simple_data_source.h" | 25 #include "webkit/glue/media/simple_data_source.h" |
25 #include "webkit/glue/media/video_renderer_impl.h" | 26 #include "webkit/glue/media/video_renderer_impl.h" |
26 #include "webkit/glue/plugins/webplugin_impl.h" | 27 #include "webkit/glue/plugins/webplugin_impl.h" |
27 #include "webkit/glue/plugins/webplugin_page_delegate.h" | 28 #include "webkit/glue/plugins/webplugin_page_delegate.h" |
28 #include "webkit/glue/webkitclient_impl.h" | 29 #include "webkit/glue/webkitclient_impl.h" |
29 #include "webkit/glue/webmediaplayer_impl.h" | 30 #include "webkit/glue/webmediaplayer_impl.h" |
30 #include "webkit/support/platform_support.h" | 31 #include "webkit/support/platform_support.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 }; | 66 }; |
66 | 67 |
67 class WebPluginImplWithPageDelegate | 68 class WebPluginImplWithPageDelegate |
68 : public webkit_support::TestWebPluginPageDelegate, | 69 : public webkit_support::TestWebPluginPageDelegate, |
69 public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>, | 70 public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>, |
70 public webkit_glue::WebPluginImpl { | 71 public webkit_glue::WebPluginImpl { |
71 public: | 72 public: |
72 WebPluginImplWithPageDelegate(WebFrame* frame, | 73 WebPluginImplWithPageDelegate(WebFrame* frame, |
73 const WebPluginParams& params) | 74 const WebPluginParams& params) |
74 : webkit_support::TestWebPluginPageDelegate(), | 75 : webkit_support::TestWebPluginPageDelegate(), |
75 webkit_glue::WebPluginImpl(frame, params, AsWeakPtr()) {} | 76 webkit_glue::WebPluginImpl( |
| 77 frame, params, FilePath(), params.mimeType.utf8(), AsWeakPtr()) {} |
76 virtual ~WebPluginImplWithPageDelegate() {} | 78 virtual ~WebPluginImplWithPageDelegate() {} |
77 private: | 79 private: |
78 DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate); | 80 DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate); |
79 }; | 81 }; |
80 | 82 |
81 } // namespace | 83 } // namespace |
82 | 84 |
83 namespace webkit_support { | 85 namespace webkit_support { |
84 | 86 |
85 static TestEnvironment* test_environment; | 87 static TestEnvironment* test_environment; |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 SimpleDatabaseSystem::GetInstance()->ClearAllDatabases(); | 286 SimpleDatabaseSystem::GetInstance()->ClearAllDatabases(); |
285 } | 287 } |
286 | 288 |
287 // Bridge for SimpleResourceLoaderBridge | 289 // Bridge for SimpleResourceLoaderBridge |
288 | 290 |
289 void SetAcceptAllCookies(bool accept) { | 291 void SetAcceptAllCookies(bool accept) { |
290 SimpleResourceLoaderBridge::SetAcceptAllCookies(accept); | 292 SimpleResourceLoaderBridge::SetAcceptAllCookies(accept); |
291 } | 293 } |
292 | 294 |
293 } // namespace webkit_support | 295 } // namespace webkit_support |
OLD | NEW |