Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/chrome/content/WebrtcUI.js

Issue 29348083: Issue 3769 - UI colours gone bad (Closed)
Patch Set: Created July 21, 2016, 2:09 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this file, 2 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
3 * You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * You can obtain one at http://mozilla.org/MPL/2.0/. */
4 "use strict"; 4 "use strict";
5 5
6 this.EXPORTED_SYMBOLS = ["WebrtcUI"]; 6 this.EXPORTED_SYMBOLS = ["WebrtcUI"];
7 7
8 XPCOMUtils.defineLazyModuleGetter(this, "Notifications", "resource://gre/modules /Notifications.jsm"); 8 XPCOMUtils.defineLazyModuleGetter(this, "Notifications", "resource://gre/modules /Notifications.jsm");
9 9
10 var WebrtcUI = { 10 var WebrtcUI = {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 let msg = {}; 46 let msg = {};
47 if (count == 0) { 47 if (count == 0) {
48 if (this._notificationId) { 48 if (this._notificationId) {
49 Notifications.cancel(this._notificationId); 49 Notifications.cancel(this._notificationId);
50 this._notificationId = null; 50 this._notificationId = null;
51 } 51 }
52 } else { 52 } else {
53 let notificationOptions = { 53 let notificationOptions = {
54 title: Strings.brand.GetStringFromName("brandShortName"), 54 title: Strings.brand.GetStringFromName("brandShortName"),
55 when: null, // hide the date row 55 when: null, // hide the date row
56 light: [0xFF9500FF, 1000, 1000], 56 light: [0xFF009CD9, 1000, 1000],
anton 2016/09/30 07:05:00 may be add comment here (that it matches to any ja
diegocarloslima 2016/10/24 16:07:51 Yes, I agree that is always good to reference all
57 ongoing: true 57 ongoing: true
58 }; 58 };
59 59
60 let cameraActive = false; 60 let cameraActive = false;
61 let audioActive = false; 61 let audioActive = false;
62 for (let i = 0; i < count; i++) { 62 for (let i = 0; i < count; i++) {
63 let win = windows.GetElementAt(i); 63 let win = windows.GetElementAt(i);
64 let hasAudio = {}; 64 let hasAudio = {};
65 let hasVideo = {}; 65 let hasVideo = {};
66 MediaManagerService.mediaCaptureWindowState(win, hasVideo, hasAudio); 66 MediaManagerService.mediaCaptureWindowState(win, hasVideo, hasAudio);
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 if (videoDevices.length > 0) 238 if (videoDevices.length > 0)
239 extraItems = [ Strings.browser.GetStringFromName("getUserMedia.audioDevi ce.none") ]; 239 extraItems = [ Strings.browser.GetStringFromName("getUserMedia.audioDevi ce.none") ];
240 this._addDevicesToOptions(audioDevices, "audioDevice", options, extraItems ); 240 this._addDevicesToOptions(audioDevices, "audioDevice", options, extraItems );
241 } 241 }
242 242
243 let buttons = this.getDeviceButtons(audioDevices, videoDevices, aCallID); 243 let buttons = this.getDeviceButtons(audioDevices, videoDevices, aCallID);
244 244
245 NativeWindow.doorhanger.show(message, "webrtc-request", buttons, BrowserApp. selectedTab.id, options); 245 NativeWindow.doorhanger.show(message, "webrtc-request", buttons, BrowserApp. selectedTab.id, options);
246 } 246 }
247 } 247 }
OLDNEW
« no previous file with comments | « mobile/android/base/toolbar/ToolbarEditLayout.java ('k') | mobile/android/themes/core/aboutBase.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld