| 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 "app/gfx/gl/gl_implementation.h" | 7 #include "app/gfx/gl/gl_implementation.h" |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 0); | 282 0); |
| 283 webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered = | 283 webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered = |
| 284 new webkit_glue::MediaResourceLoaderBridgeFactory( | 284 new webkit_glue::MediaResourceLoaderBridgeFactory( |
| 285 GURL(), // referrer | 285 GURL(), // referrer |
| 286 "null", // frame origin | 286 "null", // frame origin |
| 287 "null", // main_frame_origin | 287 "null", // main_frame_origin |
| 288 base::GetCurrentProcId(), | 288 base::GetCurrentProcId(), |
| 289 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, | 289 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, |
| 290 0); | 290 0); |
| 291 | 291 |
| 292 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer = | 292 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( |
| 293 new webkit_glue::VideoRendererImpl(false); | 293 new webkit_glue::VideoRendererImpl(false)); |
| 294 collection.push_back(video_renderer); | 294 collection.push_back(video_renderer); |
| 295 | 295 |
| 296 return new webkit_glue::WebMediaPlayerImpl( | 296 return new webkit_glue::WebMediaPlayerImpl( |
| 297 client, collection, bridge_factory_simple, bridge_factory_buffered, | 297 client, collection, bridge_factory_simple, bridge_factory_buffered, |
| 298 false, video_renderer); | 298 false, video_renderer); |
| 299 } | 299 } |
| 300 | 300 |
| 301 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 301 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
| 302 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 302 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
| 303 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 303 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 callbacks->didFail(WebKit::WebFileErrorSecurity); | 549 callbacks->didFail(WebKit::WebFileErrorSecurity); |
| 550 } else { | 550 } else { |
| 551 callbacks->didOpenFileSystem( | 551 callbacks->didOpenFileSystem( |
| 552 "TestShellFileSystem", | 552 "TestShellFileSystem", |
| 553 webkit_glue::FilePathToWebString( | 553 webkit_glue::FilePathToWebString( |
| 554 test_environment->webkit_client()->file_system_root())); | 554 test_environment->webkit_client()->file_system_root())); |
| 555 } | 555 } |
| 556 } | 556 } |
| 557 | 557 |
| 558 } // namespace webkit_support | 558 } // namespace webkit_support |
| OLD | NEW |