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 bf52557127b8f103ac3ac87f487a744827ca1e47..44ad3bd9b10ed79ec6bc3e5596632f57b89e4282 100644 |
--- a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js |
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js |
@@ -125,10 +125,21 @@ cr.define('oobe', function() { |
userImageList.addEventListener('keydown', function(e) { |
var prevIndex = userImageScreen.selectedUserImage_; |
var len = userImageList.children.length; |
+ var nextIndex; |
if (e.keyCode == 39 || e.keyCode == 40) // right or down |
- UserImageScreen.selectUserImage((prevIndex + 1) % len); |
+ nextIndex = (prevIndex + 1) % len; |
else if (e.keyCode == 37 || e.keyCode == 38) // left or up |
- UserImageScreen.selectUserImage((prevIndex - 1 + len) % len); |
+ nextIndex = (prevIndex - 1 + len) % len; |
+ else if (e.keyCode == 13 && prevIndex == 0) |
+ // Enter pressed while "Take photo" button active. |
+ chrome.send('takePhoto'); |
+ if (nextIndex == 0) |
+ // "Take photo" button: don't send a selection event to Chrome, |
+ // just focus element and update selected index. |
+ UserImageScreen.selectUserImage(0); |
+ else if (nextIndex) { |
whywhat
2011/08/30 12:03:14
nit: be consistent when using {}: I'd use it in bo
Ivan Korotkov
2011/08/30 12:16:40
Done.
|
+ chrome.send('selectImage', [userImageList.children[nextIndex].src]); |
+ } |
e.stopPropagation(); |
}); |
}; |