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

Unified Diff: chrome/browser/resources/options/chromeos/change_picture_options.js

Issue 8879048: [cros] Change Picture prefs page: DOM initialization moved to separate handler from Initialize. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/chromeos/change_picture_options.js
diff --git a/chrome/browser/resources/options/chromeos/change_picture_options.js b/chrome/browser/resources/options/chromeos/change_picture_options.js
index 338ce539af0c58d1706c99a6ae4eb1426e8555cc..e3e78110dca2ee598464f7d93b5deae16b3ec998 100644
--- a/chrome/browser/resources/options/chromeos/change_picture_options.js
+++ b/chrome/browser/resources/options/chromeos/change_picture_options.js
@@ -72,6 +72,8 @@ cr.define('options', function() {
// Old user image data (if present).
this.oldImage_ = null;
+
+ chrome.send('onChangePicturePageInitialized');
},
/**
@@ -79,15 +81,17 @@ cr.define('options', function() {
*/
didShowPage: function() {
$('images-grid').updateAndFocus();
- chrome.send('onPageShown');
+ chrome.send('onChangePicturePageShown');
},
/**
* Called right before the page is hidden.
*/
willHidePage: function() {
+ var imageGrid = $('images-grid');
+ imageGrid.blur(); // Make sure the image grid is not active.
if (this.oldImage_) {
- $('images-grid').removeItem(this.oldImage_);
+ imageGrid.removeItem(this.oldImage_);
this.oldImage_ = null;
}
},
@@ -97,7 +101,6 @@ cr.define('options', function() {
* @private
*/
closePage_: function() {
- $('images-grid').blur(); // Make sure the image grid is not active.
OptionsPage.navigateToPage('personal');
},
@@ -219,11 +222,11 @@ cr.define('options', function() {
},
/**
- * Appends received images to the image grid.
- * @param {Array.<string>} images An array of URLs to user images.
+ * Appends default images to the image grid. Should only be called once.
+ * @param {Array.<string>} images An array of URLs to default images.
* @private
*/
- setUserImages_: function(images) {
+ setDefaultImages_: function(images) {
var imageGrid = $('images-grid');
for (var i = 0, url; url = images[i]; i++) {
imageGrid.addItem(url);
@@ -234,10 +237,10 @@ cr.define('options', function() {
// Forward public APIs to private implementations.
[
'setCameraPresent',
+ 'setDefaultImages',
'setOldImage',
'setProfileImage',
'setSelectedImage',
- 'setUserImages',
].forEach(function(name) {
ChangePictureOptions[name] = function(value1, value2) {
ChangePictureOptions.getInstance()[name + '_'](value1, value2);

Powered by Google App Engine
This is Rietveld 408576698