diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-22 08:59:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-22 08:59:14 +0100 |
| commit | eaac0616072e22313ea96eb6e68d9a8f28f70dc7 (patch) | |
| tree | c967d49511cb2696bdca86affac1e6ee7b374a3b /dom/base/Navigator.cpp | |
| parent | d77729916b4b9c2b67abd41181336c2cbb1da968 (diff) | |
| parent | 6f96569b4499be07c210ca6c38739bbbc7ebdee7 (diff) | |
| download | UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.gz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.lz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.xz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.zip | |
Merge branch 'ported-moebius'
Diffstat (limited to 'dom/base/Navigator.cpp')
| -rw-r--r-- | dom/base/Navigator.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 290af152b..8b20d0196 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1854,16 +1854,6 @@ Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, nsIURI* aURI, { MOZ_ASSERT(NS_IsMainThread()); - if (!aIsCallerChrome) { - const nsAdoptingString& override = - mozilla::Preferences::GetString("general.useragent.override"); - - if (override) { - aUserAgent = override; - return NS_OK; - } - } - nsresult rv; nsCOMPtr<nsIHttpProtocolHandler> service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); |