Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset bce2fc00ba0e (bug 838332) for Android M8 Test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-11-18 15:56:58 +01:00
parent 08f08958bf
commit 295d4a12e6
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mobile/android/chrome/content/browser.js
View File

@ -2945,8 +2945,6 @@ var LightWeightThemeWebInstaller = {
var DesktopUserAgent = {
DESKTOP_UA: null,
TCO_DOMAIN: "t.co",
TCO_REPLACE: / Gecko.*/,
init: function ua_init() {
Services.obs.addObserver(this, "DesktopMode:Change", false);
@ -2962,38 +2960,24 @@ var DesktopUserAgent = {
onRequest: function(channel, defaultUA) {
let channelWindow = this._getWindowForRequest(channel);
let tab = BrowserApp.getTabForWindow(channelWindow);
if (tab) {
defaultUA = this.getUserAgentForTab(tab) || defaultUA;
}
if (tab == null)
return null;
#ifdef NIGHTLY_BUILD
if (this.TCO_DOMAIN == channel.URI.host) {
// Force the referrer
channel.referrer = channel.URI;
// Send a bot-like UA to t.co to get a real redirect. We strip off the
// "Gecko/x.y Firefox/x.y" part
return defaultUA.replace(this.TCO_REPLACE, "");
}
#endif
return defaultUA;
return this.getUserAgentForTab(tab);
},
getUserAgentForWindow: function ua_getUserAgentForWindow(aWindow) {
let tab = BrowserApp.getTabForWindow(aWindow.top);
if (tab) {
if (tab)
return this.getUserAgentForTab(tab);
}
return null;
},
getUserAgentForTab: function ua_getUserAgentForTab(aTab) {
// Send desktop UA if "Request Desktop Site" is enabled.
if (aTab.desktopMode) {
if (aTab.desktopMode)
return this.DESKTOP_UA;
}
return null;
},
@ -3030,9 +3014,8 @@ var DesktopUserAgent = {
if (aTopic === "DesktopMode:Change") {
let args = JSON.parse(aData);
let tab = BrowserApp.getTabForId(args.tabId);
if (tab) {
if (tab != null)
tab.reloadWithMode(args.desktopMode);
}
}
}
};