Index: chrome/browser/resources/chromeos/login/oobe_screen_user_image.js |
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js |
index cb7d0a24373dc59fc4e63932b0e106088648e179..9315e5eef1e1f08ab5951092feae1e237997a5b4 100644 |
--- a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js |
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js |
@@ -61,11 +61,6 @@ cr.define('login', function() { |
selectedUserImage_: -1, |
/** |
- * Indicates if profile picture should be displayed on current screen. |
- */ |
- profilePictureEnabled_: false, |
- |
- /** |
* URL for profile picture. |
*/ |
profileImageUrl_: null, |
@@ -97,10 +92,26 @@ cr.define('login', function() { |
loadTimeData.getString('takePhoto'), |
loadTimeData.getString('photoFromCamera')); |
- this.setProfilePictureEnabled_(true); |
- |
this.profileImageLoading = true; |
+ // Profile image data (if present). |
+ this.profileImage_ = imageGrid.addItem( |
+ ButtonImages.PROFILE_PICTURE, // Image URL. |
+ loadTimeData.getString('profilePhoto'), // Title. |
+ undefined, // Click handler. |
+ 0, // Position. |
+ function(el) { |
+ // Custom decorator for Profile image element. |
+ var spinner = el.ownerDocument.createElement('div'); |
+ spinner.className = 'spinner'; |
+ var spinnerBg = el.ownerDocument.createElement('div'); |
+ spinnerBg.className = 'spinner-bg'; |
+ spinnerBg.appendChild(spinner); |
+ el.appendChild(spinnerBg); |
+ el.id = 'profile-image'; |
+ }); |
+ this.profileImage_.type = 'profile'; |
+ |
$('take-photo').addEventListener( |
'click', this.handleTakePhoto_.bind(this)); |
$('discard-photo').addEventListener( |
@@ -349,32 +360,8 @@ cr.define('login', function() { |
* @private |
*/ |
setProfilePictureEnabled_: function(enabled) { |
- if (this.profilePictureEnabled_ == enabled) |
- return; |
- this.profilePictureEnabled_ = enabled; |
var imageGrid = $('user-image-grid'); |
if (enabled) { |
- var url = ButtonImages.PROFILE_PICTURE; |
- if (!this.profileImageLoading && this.profileImageUrl_ !== null) { |
- url = this.profileImageUrl_; |
- } |
- // Profile image data (if present). |
- this.profileImage_ = imageGrid.addItem( |
- url, // Image URL. |
- loadTimeData.getString('profilePhoto'), // Title. |
- undefined, // Click handler. |
- 0, // Position. |
- this.profileImageLoading ? function(el) { |
- // Custom decorator for Profile image element. |
- var spinner = el.ownerDocument.createElement('div'); |
- spinner.className = 'spinner'; |
- var spinnerBg = el.ownerDocument.createElement('div'); |
- spinnerBg.className = 'spinner-bg'; |
- spinnerBg.appendChild(spinner); |
- el.appendChild(spinnerBg); |
- el.id = 'profile-image'; |
- } : undefined); |
- this.profileImage_.type = 'profile'; |
} else { |
imageGrid.removeItem(this.profileImage_); |
} |