Show third party wallpaper app name in wallpaper picker

chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * WallpaperManager constructor.
  *
  * WallpaperManager objects encapsulate the functionality of the wallpaper
  * manager extension.
  *
@@ skipping 235 matching lines @@
     i18nTemplate.process(this.document_, loadTimeData);
     this.initCategoriesList_();
     this.initThumbnailsGrid_();
     this.presetCategory_();
 
     $('file-selector').addEventListener(
         'change', this.onFileSelectorChanged_.bind(this));
     $('set-wallpaper-layout').addEventListener(
         'change', this.onWallpaperLayoutChanged_.bind(this));
 
+    if (loadTimeData.valueExists('wallpaperAppName')) {
+      $('wallpaper-set-by-message').hidden = false;

[flackr, 2014/06/17 15:20:34]

Use the :empty CSS selector to automatically hide this element when empty. Then
setting the text content will implicitly make it visible.

[bshe, 2014/06/17 19:01:44]

Done.

+      $('wallpaper-set-by-message').innerText = loadTimeData.getStringF(

[flackr, 2014/06/17 15:20:34]

s/innerText/textContent

[bshe, 2014/06/17 19:01:44]

Done.

+          'currentWallpaperSetByMessage', str('wallpaperAppName'));
+    }
+
     if (this.enableOnlineWallpaper_) {
       var self = this;
       $('surprise-me').hidden = false;
       $('surprise-me').addEventListener('click',
                                         this.toggleSurpriseMe_.bind(this));
       Constants.WallpaperSyncStorage.get(Constants.AccessSurpriseMeEnabledKey,
                                           function(items) {
         // Surprise me has been moved from local to sync storage, prefer
         // values from sync, but if unset check local and update synced pref
         // if applicable.
@@ skipping 79 matching lines @@
         return;
       this.removeCustomWallpaper(item.baseURL);
       wallpaperGrid.dataModel.splice(selectedIndex, 1);
       // Calculate the number of remaining custom wallpapers. The add new button
       // in data model needs to be excluded.
       var customWallpaperCount = wallpaperGrid.dataModel.length - 1;
       if (customWallpaperCount == 0) {
         // Active custom wallpaper is also copied in chronos data dir. It needs
         // to be deleted.
         chrome.wallpaperPrivate.resetWallpaper();
+        this.hideWallpaperSetByMessage_();

[flackr, 2014/06/17 15:20:34]

Rather than sprinkling this throughout the code, can you add a function which is
called when the wallpaper is changed? Perhaps onWallpaperChanged_.

[bshe, 2014/06/17 19:01:44]

Unfortunately, there are a few private APIs(setWallpaper, setWallpaperIfExist,
setCustomWallpaper, resetWallpaper) that might change wallpaper. And after each
api call, we dont want to do the same thing. This makes adding a general
onWallpaperChanged_ function not trivial and possibly very complicate code. Do
you mind if I keep it this way?

[flackr, 2014/06/18 00:59:48]

Even if the only thing "onWallpaperChanged" does is call
hideWallpaperSetByMessage, I think it would be better to have that function
called for readability and maintainability. Right now it's not clear which
conditions it should be called in.

[bshe, 2014/06/18 21:07:42]

make sense. Added a onWallpaperChanged function and added some common logic into
it.

On 2014/06/18 00:59:48, flackr wrote:

       } else {
         selectedIndex = Math.min(selectedIndex, customWallpaperCount - 1);
         wallpaperGrid.selectionModel.selectedIndex = selectedIndex;
       }
       event.cancelBubble = true;
     }
   };
 
   /**
    * Decides if a command can be executed on current target.
@@ skipping 101 matching lines @@
       this.wallpaperRequest_.addEventListener('loadend', function() {
         // Close window on wallpaper loading finished.
         window.close();
       });
     } else {
       window.close();
     }
   };
 
   /**
+   * Hides the wallpaper set by message. It should be called after user changed
+   * wallpaper through wallpaper picker.
+   */
+  WallpaperManager.prototype.hideWallpaperSetByMessage_ = function() {
+    $('wallpaper-set-by-message').hidden = true;
+    $('wallpaper-set-by-message').innerText = '';

[flackr, 2014/06/17 15:20:34]

s/innerText/textContent

[bshe, 2014/06/17 19:01:44]

Done. There is only one line left in this function but it is probably still make
sense to keep this function as the function name is more readable than set
textContext to empty. WDYT?

+  }
+
+  /**
     * Sets wallpaper to the corresponding wallpaper of selected thumbnail.
     * @param {{baseURL: string, layout: string, source: string,
     *          availableOffline: boolean, opt_dynamicURL: string,
     *          opt_author: string, opt_authorWebsite: string}}
     *     selectedItem the selected item in WallpaperThumbnailsGrid's data
     *     model.
     */
   WallpaperManager.prototype.setSelectedWallpaper_ = function(selectedItem) {
     var self = this;
     switch (selectedItem.source) {
       case Constants.WallpaperSourceEnum.Custom:
         var errorHandler = this.onFileSystemError_.bind(this);
         var setActive = function() {
           self.wallpaperGrid_.activeItem = selectedItem;
           self.currentWallpaper_ = selectedItem.baseURL;
+          self.hideWallpaperSetByMessage_();
         };
         var success = function(dirEntry) {
           dirEntry.getFile(selectedItem.baseURL, {create: false},
                            function(fileEntry) {
             fileEntry.file(function(file) {
               var reader = new FileReader();
               reader.readAsArrayBuffer(file);
               reader.addEventListener('error', errorHandler);
               reader.addEventListener('load', function(e) {
                 self.setCustomWallpaper(e.target.result,
                                         selectedItem.layout,
                                         false, selectedItem.baseURL,
                                         setActive, errorHandler);
               });
             }, errorHandler);
           }, errorHandler);
         }
         this.wallpaperDirs_.getDirectory(WallpaperDirNameEnum.ORIGINAL,
                                          success, errorHandler);
         break;
       case Constants.WallpaperSourceEnum.OEM:
         // Resets back to default wallpaper.
         chrome.wallpaperPrivate.resetWallpaper();
+        this.hideWallpaperSetByMessage_();
         this.currentWallpaper_ = selectedItem.baseURL;
         this.wallpaperGrid_.activeItem = selectedItem;
         WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout,
                                         selectedItem.source);
         break;
       case Constants.WallpaperSourceEnum.Online:
         var wallpaperURL = selectedItem.baseURL +
             Constants.HighResolutionSuffix;
         var selectedGridItem = this.wallpaperGrid_.getListItem(selectedItem);
 
         chrome.wallpaperPrivate.setWallpaperIfExists(wallpaperURL,
                                                      selectedItem.layout,
                                                      function(exists) {
           if (exists) {
             self.currentWallpaper_ = wallpaperURL;
             self.wallpaperGrid_.activeItem = selectedItem;
+            self.hideWallpaperSetByMessage_();
             WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout,
                                             selectedItem.source);
             return;
           }
 
           // Falls back to request wallpaper from server.
           if (self.wallpaperRequest_)
             self.wallpaperRequest_.abort();
 
           self.wallpaperRequest_ = new XMLHttpRequest();
@@ skipping 346 matching lines @@
           chrome.runtime.lastError.message != str('canceledWallpaper')) {
         self.showError_(chrome.runtime.lastError.message);
         $('set-wallpaper-layout').disabled = true;
         failure();
       } else {
         success(opt_thumbnail);
         // Custom wallpapers are not synced yet. If login on a different
         // computer after set a custom wallpaper, wallpaper wont change by sync.
         WallpaperUtil.saveWallpaperInfo(fileName, layout,
                                         Constants.WallpaperSourceEnum.Custom);
+        self.hideWallpaperSetByMessage_();
       }
     };
 
     chrome.wallpaperPrivate.setCustomWallpaper(wallpaper, layout,
                                                generateThumbnail,
                                                fileName, onFinished);
   };
 
   /**
    * Sets wallpaper finished. Displays error message if any.
    * @param {WallpaperThumbnailsGridItem=} opt_selectedGridItem The wallpaper
    *     thumbnail grid item. It extends from cr.ui.ListItem.
    * @param {{baseURL: string, layout: string, source: string,
    *          availableOffline: boolean, opt_dynamicURL: string,
    *          opt_author: string, opt_authorWebsite: string}=}
    *     opt_selectedItem the selected item in WallpaperThumbnailsGrid's data
    *     model.
    */
   WallpaperManager.prototype.onFinished_ = function(opt_selectedGridItem,
                                                     opt_selectedItem) {
     if (opt_selectedGridItem)
       this.progressManager_.hideProgressBar(opt_selectedGridItem);
 
     if (chrome.runtime.lastError != undefined &&
         chrome.runtime.lastError.message != str('canceledWallpaper')) {
       this.showError_(chrome.runtime.lastError.message);
     } else if (opt_selectedItem) {
       this.wallpaperGrid_.activeItem = opt_selectedItem;
+      this.hideWallpaperSetByMessage_();
     }
   };
 
   /**
    * Handles the layout setting change of custom wallpaper.
    */
   WallpaperManager.prototype.onWallpaperLayoutChanged_ = function() {
     var layout = getSelectedLayout();
     var self = this;
     chrome.wallpaperPrivate.setCustomWallpaperLayout(layout, function() {
       if (chrome.runtime.lastError != undefined &&
           chrome.runtime.lastError.message != str('canceledWallpaper')) {
         self.showError_(chrome.runtime.lastError.message);
         self.removeCustomWallpaper(fileName);
         $('set-wallpaper-layout').disabled = true;
       } else {
         WallpaperUtil.saveToStorage(self.currentWallpaper_, layout, false);
+        self.hideWallpaperSetByMessage_();
       }
     });
   };
 
   /**
    * Handles user clicking on a different category.
    */
   WallpaperManager.prototype.onCategoriesChange_ = function() {
     var categoriesList = this.categoriesList_;
     var selectedIndex = categoriesList.selectionModel.selectedIndex;
@@ skipping 104 matching lines @@
           }
         }
       }
       this.wallpaperGrid_.dataModel = wallpapersDataModel;
       this.wallpaperGrid_.selectedItem = selectedItem;
       this.wallpaperGrid_.activeItem = selectedItem;
     }
   };
 
 })();