diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 03:52:01 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 03:52:01 +0000 |
| commit | 7bd563d073ebe7745e11fd0bee91ec15950c867c (patch) | |
| tree | 57e28acd1e6a9abb36769808215fb39f47b1a830 | |
| parent | 473aef1d763b3f05b031e901f2209e8d49f8e597 (diff) | |
| download | chromium_src-7bd563d073ebe7745e11fd0bee91ec15950c867c.zip chromium_src-7bd563d073ebe7745e11fd0bee91ec15950c867c.tar.gz chromium_src-7bd563d073ebe7745e11fd0bee91ec15950c867c.tar.bz2 | |
Convert to KURL, and then use the glue_util function to convert from
KURL to WebURL. That conversion will go away once this code moves
into WebKit/chromium/src.
R=hclam
Review URL: http://codereview.chromium.org/114009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15511 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/webmediaplayerclient_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webmediaplayerclient_impl.cc b/webkit/glue/webmediaplayerclient_impl.cc index 2831f61..8fec5f4 100644 --- a/webkit/glue/webmediaplayerclient_impl.cc +++ b/webkit/glue/webmediaplayerclient_impl.cc @@ -16,6 +16,7 @@ #include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "webkit/glue/glue_util.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webview.h" #include "webkit/glue/webview_delegate.h" @@ -25,6 +26,7 @@ #include "GraphicsContext.h" #include "HTMLMediaElement.h" #include "IntSize.h" +#include "KURL.h" #include "MediaPlayer.h" #include "NotImplemented.h" #include "PlatformContextSkia.h" @@ -99,9 +101,7 @@ void WebMediaPlayerClientImpl::load(const String& url) { WebFrame* webFrame = WebFrameImpl::FromFrame(frame); WebViewDelegate* d = webFrame->GetView()->GetDelegate(); m_webMediaPlayer = d->CreateWebMediaPlayer(this); - // TODO(hclam): Is there a simpler way to convert from WebCore::String to - // WebKit::WebURL? - m_webMediaPlayer->load(WebKit::WebURL(GURL(WebString::fromUTF8(url.utf8())))); + m_webMediaPlayer->load(webkit_glue::KURLToWebURL(KURL(url))); } void WebMediaPlayerClientImpl::cancelLoad() { |