Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / login / user_pod_row.js

diff --git a/src/chrome/browser/resources/login/user_pod_row.js b/src/chrome/browser/resources/login/user_pod_row.js
index fa4db8f..d5e30dc 100644 (file)
--- a/src/chrome/browser/resources/login/user_pod_row.js
+++ b/src/chrome/browser/resources/login/user_pod_row.js
@@ -1135,11 +1135,7 @@ cr.define('login', function() {
 
     /** @override */
     update: function() {
-      // TODO(noms): Use the actual profile avatar for local profiles once the
-      // new, non-pixellated avatars are available.
-      this.imageElement.src = this.user.emailAddress == '' ?
-          'chrome://theme/IDR_USER_MANAGER_DEFAULT_AVATAR' :
-          this.user.userImage;
+      this.imageElement.src = this.user.userImage;
       this.nameElement.textContent = this.user.displayName;
 
       var isLockedUser = this.user.needsSignin;
@@ -1148,6 +1144,11 @@ cr.define('login', function() {
       this.passwordElement.hidden = !isLockedUser;
       this.nameElement.hidden = isLockedUser;
 
+      if (this.isAuthTypeUserClick) {
+        this.passwordLabelElement.textContent = this.authValue;
+        this.customButtonElement.tabIndex = -1;
+      }
+
       UserPod.prototype.updateActionBoxArea.call(this);
     },
 
@@ -1202,6 +1203,9 @@ cr.define('login', function() {
       // just activate the pod and show the password field.
       if (!this.user.needsSignin && !this.isActionBoxMenuActive)
         this.activate(e);
+
+      if (this.isAuthTypeUserClick)
+        chrome.send('attemptUnlock', [this.user.emailAddress]);
     },
 
     /** @override */
@@ -2197,8 +2201,6 @@ cr.define('login', function() {
           focusedPod.reset(true);
           // Notify screen that it is ready.
           screen.onShow();
-          if (!focusedPod.user.isApp && self.focusedPod_ == focusedPod)
-            chrome.send('loadWallpaper', [focusedPod.user.username]);
         });
         // Guard timer for 1 second -- it would conver all possible animations.
         ensureTransitionEndEvent(focusedPod, 1000);