Backed out changeset 0096df4879f7 (bug 995777) for rc2 test failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 24 Apr 2014 12:26:27 +0200
changeset 198494 64a84390c1b2a98fcd4679b90cee55fea90b36f1
parent 198493 b9660304f8ef367e44d56ecf63d41263459d3baa
child 198495 d82f461b1f3fbdddde53f07fa82fb56abd92606e
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs995777
milestone31.0a1
backs out0096df4879f78182fd30ac4c6011a2f845579c3c
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
Backed out changeset 0096df4879f7 (bug 995777) for rc2 test failures
mobile/android/chrome/content/WebrtcUI.js
mobile/android/locales/en-US/chrome/browser.properties
--- a/mobile/android/chrome/content/WebrtcUI.js
+++ b/mobile/android/chrome/content/WebrtcUI.js
@@ -192,18 +192,18 @@ var WebrtcUI = {
     let options = { inputs: [] };
     // if the users only option would be to select "No Audio" or "No Video"
     // i.e. we're only showing audio or only video and there is only one device for that type
     // don't bother showing a menulist to select from
     var extraItems = null;
     if (videoDevices.length > 1 || audioDevices.length > 0) {
       // Only show the No Video option if there are also Audio devices to choose from
       if (audioDevices.length > 0)
-        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoSource.none") ];
-      this._addDevicesToOptions(videoDevices, "videoSource", options, extraItems);
+        extraItems = [ Strings.browser.GetStringFromName("getUserMedia.videoDevice.none") ];
+      this._addDevicesToOptions(videoDevices, "videoDevice", options, extraItems);
     }
 
     if (audioDevices.length > 1 || videoDevices.length > 0) {
       // Only show the No Audio option if there are also Video devices to choose from
       if (videoDevices.length > 0)
         extraItems = [ Strings.browser.GetStringFromName("getUserMedia.audioDevice.none") ];
       this._addDevicesToOptions(audioDevices, "audioDevice", options, extraItems);
     }
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -294,22 +294,22 @@ lwthemeInstallRequest.message=This site 
 lwthemeInstallRequest.allowButton=Allow
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.shareCamera.message = Would you like to share your camera with %S?
 getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.denyRequest.label = Don't Share
 getUserMedia.shareRequest.label = Share
-getUserMedia.videoSource.default = Camera %S
-getUserMedia.videoSource.frontCamera = Front facing camera
-getUserMedia.videoSource.backCamera = Back facing camera
-getUserMedia.videoSource.none = No Video
-getUserMedia.videoSource.tabShare = Choose a tab to stream
-getUserMedia.videoSource.prompt = Video source
+getUserMedia.videoDevice.default = Camera %S
+getUserMedia.videoDevice.frontCamera = Front facing camera
+getUserMedia.videoDevice.backCamera = Back facing camera
+getUserMedia.videoDevice.none = No Video
+getUserMedia.videoDevice.tabShare = Choose a tab to stream
+getUserMedia.videoDevice.prompt = Video source
 getUserMedia.audioDevice.default = Microphone %S
 getUserMedia.audioDevice.none = No Audio
 getUserMedia.audioDevice.prompt = Microphone to use
 getUserMedia.sharingCamera.message2 = Camera is on
 getUserMedia.sharingMicrophone.message2 = Microphone is on
 getUserMedia.sharingCameraAndMicrophone.message2 = Camera and microphone are on
 
 #Reader mode