Chromium Code Reviews| Index: chrome/renderer/chrome_content_renderer_client.cc |
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
| index a8ea3b235f49b2755e479798adeedab62407e6d5..5ca22acd49a8fc6bef197801b1fa58d97ff08279 100644 |
| --- a/chrome/renderer/chrome_content_renderer_client.cc |
| +++ b/chrome/renderer/chrome_content_renderer_client.cc |
| @@ -1438,13 +1438,20 @@ GURL ChromeContentRendererClient::OverrideFlashEmbedWithHTML(const GURL& url) { |
| } |
| GURL corrected_url = GURL(url_str); |
| - |
| - // We don't modify any URLs that contain the enablejsapi=1 parameter |
| - // since the page may be interacting with the YouTube Flash player in |
| - // Javascript and we don't want to break working content. |
| + bool android_enablejsapi = false; |
| + // Unless we're on an Android device, we don't modify any URLs that contain |
| + // the enablejsapi=1 parameter since the page may be interacting with the |
| + // YouTube Flash player in Javascript and we don't want to break working |
| + // content. If we're on an Android device and the URL contains the |
| + // enablejsapi=1 parameter, we do override the URL. |
| if (corrected_url.query().find("enablejsapi=1") != std::string::npos) { |
| +#if defined(OS_ANDROID) |
| + RecordYouTubeRewriteUMA(internal::SUCCESS_ENABLEJSAPI); |
| + android_enablejsapi = true; |
| +#else |
| RecordYouTubeRewriteUMA(internal::FAILURE_ENABLEJSAPI); |
| return GURL(); |
| +#endif |
|
mlamouri (slow - plz ping)
2016/08/08 19:50:25
I think this would be more readable if you had:
``
kdsilva
2016/08/09 10:56:26
Done.
|
| } |
| // Change the path to use the YouTube HTML5 API |
| @@ -1454,7 +1461,8 @@ GURL ChromeContentRendererClient::OverrideFlashEmbedWithHTML(const GURL& url) { |
| url::Replacements<char> r; |
| r.SetPath(path.c_str(), url::Component(0, path.length())); |
| - RecordYouTubeRewriteUMA(invalid_url ? internal::SUCCESS_PARAMS_REWRITE |
| - : internal::SUCCESS); |
| + if (!android_enablejsapi) |
| + RecordYouTubeRewriteUMA(invalid_url ? internal::SUCCESS_PARAMS_REWRITE |
| + : internal::SUCCESS); |
|
mlamouri (slow - plz ping)
2016/08/08 19:50:25
style: add { } when there is more than a line.
kdsilva
2016/08/09 10:56:26
Done.
|
| return corrected_url.ReplaceComponents(r); |
| } |