| Index: components/plugins/renderer/mobile_youtube_plugin.cc
|
| diff --git a/components/plugins/renderer/mobile_youtube_plugin.cc b/components/plugins/renderer/mobile_youtube_plugin.cc
|
| index 889443f3e0d408d0893a743457f5c18c9113ea44..e2f5793e790e4dc55fcd2331828186d90964178a 100644
|
| --- a/components/plugins/renderer/mobile_youtube_plugin.cc
|
| +++ b/components/plugins/renderer/mobile_youtube_plugin.cc
|
| @@ -14,16 +14,16 @@
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| #include "ui/base/webui/jstemplate_builder.h"
|
|
|
| -using WebKit::WebFrame;
|
| -using WebKit::WebPlugin;
|
| -using WebKit::WebURLRequest;
|
| +using blink::WebFrame;
|
| +using blink::WebPlugin;
|
| +using blink::WebURLRequest;
|
|
|
| const char* const kSlashVSlash = "/v/";
|
| const char* const kSlashESlash = "/e/";
|
|
|
| namespace {
|
|
|
| -std::string GetYoutubeVideoId(const WebKit::WebPluginParams& params) {
|
| +std::string GetYoutubeVideoId(const blink::WebPluginParams& params) {
|
| GURL url(params.url);
|
| std::string video_id = url.path().substr(strlen(kSlashVSlash));
|
|
|
| @@ -34,7 +34,7 @@ std::string GetYoutubeVideoId(const WebKit::WebPluginParams& params) {
|
| return video_id;
|
| }
|
|
|
| -std::string HtmlData(const WebKit::WebPluginParams& params,
|
| +std::string HtmlData(const blink::WebPluginParams& params,
|
| base::StringPiece template_html) {
|
| base::DictionaryValue values;
|
| values.SetString("video_id", GetYoutubeVideoId(params));
|
| @@ -71,8 +71,8 @@ bool IsValidYouTubeVideo(const std::string& path) {
|
| namespace plugins {
|
|
|
| MobileYouTubePlugin::MobileYouTubePlugin(content::RenderView* render_view,
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebPluginParams& params,
|
| + blink::WebFrame* frame,
|
| + const blink::WebPluginParams& params,
|
| base::StringPiece& template_html,
|
| GURL placeholderDataUrl)
|
| : PluginPlaceholder(render_view,
|
| @@ -101,7 +101,7 @@ void MobileYouTubePlugin::OpenYoutubeUrlCallback(
|
| request.initialize();
|
| request.setURL(url);
|
| render_view()->LoadURLExternally(
|
| - GetFrame(), request, WebKit::WebNavigationPolicyNewForegroundTab);
|
| + GetFrame(), request, blink::WebNavigationPolicyNewForegroundTab);
|
| }
|
| void MobileYouTubePlugin::BindWebFrame(WebFrame* frame) {
|
| PluginPlaceholder::BindWebFrame(frame);
|
|
|