Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: chrome/browser/resources/chromeos/user_images_grid.js

Issue 121203002: Use window.URL instead of window.webkitURL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: window.URL -> URL in user_images_grid.js Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/feedback/js/take_screenshot.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 = URL.createObjectURL(stream);
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
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 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/feedback/js/take_screenshot.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698