Bug 851581 - Whitespace cleanup. r=mfinkle DONTBUILD
authorWes Johnston <wjohnston@mozilla.com>
Thu, 25 Apr 2013 13:35:05 -0700
changeset 140910 104d4a16aac8da36022b47ba3812a7c5518ed85a
parent 140909 6586fb3abbbe73f712a4796549c2f02ee6986752
child 140911 8658d3607e1aaaadcb02b18ffac3210c8b3dd620
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs851581
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 851581 - Whitespace cleanup. r=mfinkle DONTBUILD
mobile/android/components/ContentDispatchChooser.js
mobile/android/locales/en-US/chrome/handling.properties
--- a/mobile/android/components/ContentDispatchChooser.js
+++ b/mobile/android/components/ContentDispatchChooser.js
@@ -37,18 +37,18 @@ ContentDispatchChooser.prototype =
         window = aWindowContext.getInterface(Ci.nsIDOMWindow);
     } catch (e) { /* it's OK to not have a window */ }
 
     // The current list is based purely on the scheme. Redo the query using the url to get more
     // specific results.
     aHandler = this.protoSvc.getProtocolHandlerInfoFromOS(aURI.spec, {});
 
     // The first handler in the set is the Android Application Chooser (which will fall back to a default if one is set)
-    // If we have more than one option, show a list so the user can choose what to launch with.
-    if(aHandler.possibleApplicationHandlers.length > 1) {
+    // If we have more than one option, let the OS handle showing a list (if needed).
+    if (aHandler.possibleApplicationHandlers.length > 1) {
       aHandler.launchWithURI(aURI, aWindowContext);
     } else {
       let win = this._getChromeWin();
       if (win && win.NativeWindow) {
         let bundle = Services.strings.createBundle("chrome://browser/locale/handling.properties");
         let text = bundle.GetStringFromName("protocol.failed");
         win.NativeWindow.toast.show(text, "long");
       }
--- a/mobile/android/locales/en-US/chrome/handling.properties
+++ b/mobile/android/locales/en-US/chrome/handling.properties
@@ -1,5 +1,5 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-protocol.failed=Could not find an app to open this link
+protocol.failed=Couldn't find an application to open this link