Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 cr.define('options', function() { | 5 cr.define('options', function() { |
| 6 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; | 6 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; |
| 7 /** @const */ var Grid = cr.ui.Grid; | 7 /** @const */ var Grid = cr.ui.Grid; |
| 8 /** @const */ var GridItem = cr.ui.GridItem; | 8 /** @const */ var GridItem = cr.ui.GridItem; |
| 9 /** @const */ var GridSelectionController = cr.ui.GridSelectionController; | 9 /** @const */ var GridSelectionController = cr.ui.GridSelectionController; |
| 10 /** @const */ var ListSingleSelectionModel = cr.ui.ListSingleSelectionModel; | 10 /** @const */ var ListSingleSelectionModel = cr.ui.ListSingleSelectionModel; |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 288 | 288 |
| 289 /** | 289 /** |
| 290 * Handles successful camera check. | 290 * Handles successful camera check. |
| 291 * @param {function(): boolean} onAvailable Callback to call. If it returns | 291 * @param {function(): boolean} onAvailable Callback to call. If it returns |
| 292 * |true|, capture is started immediately. | 292 * |true|, capture is started immediately. |
| 293 * @param {MediaStream} stream Stream object as returned by getUserMedia. | 293 * @param {MediaStream} stream Stream object as returned by getUserMedia. |
| 294 * @private | 294 * @private |
| 295 */ | 295 */ |
| 296 handleCameraAvailable_: function(onAvailable, stream) { | 296 handleCameraAvailable_: function(onAvailable, stream) { |
| 297 if (this.cameraStartInProgress_ && onAvailable()) { | 297 if (this.cameraStartInProgress_ && onAvailable()) { |
| 298 this.cameraVideo_.src = window.webkitURL.createObjectURL(stream); | 298 this.cameraVideo_.src = window.URL.createObjectURL(stream); |
|
arv (Not doing code reviews)
2014/01/08 16:41:13
I would prefer just URL over window.URL.
davidben
2014/01/08 16:47:39
Done.
| |
| 299 this.cameraStream_ = stream; | 299 this.cameraStream_ = stream; |
| 300 } else { | 300 } else { |
| 301 stream.stop(); | 301 stream.stop(); |
| 302 } | 302 } |
| 303 this.cameraStartInProgress_ = false; | 303 this.cameraStartInProgress_ = false; |
| 304 }, | 304 }, |
| 305 | 305 |
| 306 /** | 306 /** |
| 307 * Handles camera check failure. | 307 * Handles camera check failure. |
| 308 * @param {NavigatorUserMediaError=} err Error object. | 308 * @param {NavigatorUserMediaError=} err Error object. |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 743 UserImagesGrid.ButtonImages = { | 743 UserImagesGrid.ButtonImages = { |
| 744 TAKE_PHOTO: 'chrome://theme/IDR_BUTTON_USER_IMAGE_TAKE_PHOTO', | 744 TAKE_PHOTO: 'chrome://theme/IDR_BUTTON_USER_IMAGE_TAKE_PHOTO', |
| 745 CHOOSE_FILE: 'chrome://theme/IDR_BUTTON_USER_IMAGE_CHOOSE_FILE', | 745 CHOOSE_FILE: 'chrome://theme/IDR_BUTTON_USER_IMAGE_CHOOSE_FILE', |
| 746 PROFILE_PICTURE: 'chrome://theme/IDR_PROFILE_PICTURE_LOADING' | 746 PROFILE_PICTURE: 'chrome://theme/IDR_PROFILE_PICTURE_LOADING' |
| 747 }; | 747 }; |
| 748 | 748 |
| 749 return { | 749 return { |
| 750 UserImagesGrid: UserImagesGrid | 750 UserImagesGrid: UserImagesGrid |
| 751 }; | 751 }; |
| 752 }); | 752 }); |
| OLD | NEW |