Sync 3rd party wallpaper app name

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 267 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')) {

[tbarzic, 2016/01/28 20:10:48]

I don't think you can get rid of this yet.
You can't assume that the app name set in local fs is properly set (e.g. if
wallpaper was set up before this change)

the logic should be:
function getAppName(callback) {
  Constants.WallpaperLocalStorage.get(thirdPartyAppName, function(items) {
    if (items.hasOwnProperty(thirdPartyAppName)) {
      callback(items[thirdPartyAppName]);
    } else {
      callback(str('wallpaperAppName') || '');
    }
  });

  getAppName(function(appName)) {
    if (!!appName) {
      // set-by message
    } else {
      // clear set-by message
    }
  }
}

[xdai1, 2016/02/02 01:19:42]

Done.

-      $('wallpaper-set-by-message').textContent = loadTimeData.getStringF(
-          'currentWallpaperSetByMessage', str('wallpaperAppName'));
-      $('wallpaper-grid').classList.add('small');
-    } else {
-      $('wallpaper-grid').classList.remove('small');
-    }
+    // Always use the value from local filesystem to avoid the time window of
+    // setting the third party app name and the third party wallpaper.
+    Constants.WallpaperLocalStorage.get(
+        Constants.AccessLocalThirdPartyAppName, function(items) {
+      if (items.hasOwnProperty(Constants.AccessLocalThirdPartyAppName) &&
+          items[Constants.AccessLocalThirdPartyAppName]) {
+        $('wallpaper-set-by-message').textContent =
+            loadTimeData.getStringF('currentWallpaperSetByMessage',
+            items[Constants.AccessLocalThirdPartyAppName]);
+        $('wallpaper-grid').classList.add('small');
+      } else {
+        $('wallpaper-grid').classList.remove('small');
+      }
+    });

[tbarzic, 2016/01/28 20:10:48]

Maybe add listener to local storage to update the message when the value
changes?
(can you test that the message gets updated if the wallpaper is changed by
another app while wallpaper manager app is active).

[xdai1, 2016/02/02 01:19:42]

Will do it in a following CL.

 
     if (this.enableOnlineWallpaper_) {
       var self = this;
       self.document_.body.setAttribute('surprise-me-disabled', '');
       $('surprise-me').hidden = false;
       $('surprise-me').addEventListener('click',
                                         this.toggleSurpriseMe_.bind(this));
       var onSurpriseMeEnabled = function() {
         $('surprise-me').querySelector('#checkbox').classList.add('checked');
         $('categories-list').disabled = true;
@@ skipping 239 matching lines @@
    * @param {?string} currentWallpaperURL The URL or filename of current
    *     wallpaper.
    */
   WallpaperManager.prototype.onWallpaperChanged_ = function(
       activeItem, currentWallpaperURL) {
     this.wallpaperGrid_.activeItem = activeItem;
     this.currentWallpaper_ = currentWallpaperURL;
     // Hides the wallpaper set by message.
     $('wallpaper-set-by-message').textContent = '';
     $('wallpaper-grid').classList.remove('small');
+    // If the user manually selects a wallpaper from the built-in wallpaper
+    // picker app, we should clear the third party app name if possible.

[tbarzic, 2016/01/28 20:10:48]

nit: remove "if possible" from the comment.
Also, s/we should clear third party app name/third party app name should be
cleared/

[xdai1, 2016/02/02 01:19:42]

Done.

+    WallpaperUtil.clearThirdPartyAppName();
   };
 
   /**
     * 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.
     */
@@ skipping 561 matching lines @@
       }
       this.wallpaperGrid_.dataModel = wallpapersDataModel;
       if (selectedItem) {
         this.wallpaperGrid_.selectedItem = selectedItem;
         this.wallpaperGrid_.activeItem = selectedItem;
       }
     }
   };
 
 })();