Bug 1219950 - Remove special youtube intent handling code. r=rnewman

This code was originally added to request HTML5 video from Youtube under
certain conditions but Youtube serves HTML5 video by default and it is no
longer necessary.

--HG--
extra : commitid : CJ6XSBLmauW
extra : rebase_source : 122f7076c58dc3e2fda15cdc22d80c6b1053bd3b
This commit is contained in:
Michael Comella 2015-10-29 16:08:11 -07:00
Родитель 3ac351d73a
Коммит f2f345b45d
1 изменённых файлов: 0 добавлений и 49 удалений

Просмотреть файл

@ -1222,31 +1222,6 @@ public class GeckoAppShell
return intent;
}
if ("vnd.youtube".equals(scheme) &&
!hasHandlersForIntent(intent) &&
!TextUtils.isEmpty(uri.getSchemeSpecificPart())) {
// Return an intent with a URI that will open the YouTube page in the
// current Fennec instance.
final Class<?> c;
final String browserClassName = AppConstants.MOZ_ANDROID_BROWSER_INTENT_CLASS;
try {
c = Class.forName(browserClassName);
} catch (ClassNotFoundException e) {
// This should never occur.
Log.wtf(LOGTAG, "Class " + browserClassName + " not found!");
return null;
}
final Uri youtubeURI = getYouTubeHTML5URI(uri);
if (youtubeURI != null) {
// Load it as a new URL in the current tab. Hitting 'back' will return
// the user to the YouTube overview page.
final Intent view = new Intent(GeckoApp.ACTION_LOAD, youtubeURI, context, c);
return view;
}
}
// Have a special handling for SMS, as the message body
// is not extracted from the URI automatically.
if (!"sms".equals(scheme)) {
@ -1297,30 +1272,6 @@ public class GeckoAppShell
intent.setSelector(null);
}
/**
* Input: vnd:youtube:3MWr19Dp2OU?foo=bar
* Output: https://www.youtube.com/embed/3MWr19Dp2OU?foo=bar
*
* Ideally this should include ?html5=1. However, YouTube seems to do a
* fine job of taking care of this on its own, and the Kindle Fire ships
* Flash, so...
*
* @param uri a vnd:youtube URI.
* @return an HTTPS URI for web player.
*/
private static Uri getYouTubeHTML5URI(final Uri uri) {
if (uri == null) {
return null;
}
final String ssp = uri.getSchemeSpecificPart();
if (TextUtils.isEmpty(ssp)) {
return null;
}
return Uri.parse("https://www.youtube.com/embed/" + ssp);
}
/**
* Only called from GeckoApp.
*/