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')) {
-      $('wallpaper-set-by-message').textContent = loadTimeData.getStringF(
-          'currentWallpaperSetByMessage', str('wallpaperAppName'));
-      $('wallpaper-grid').classList.add('small');
-    } else {
-      $('wallpaper-grid').classList.remove('small');
-    }
-
     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;
         $('wallpaper-grid').disabled = true;
@@ skipping 20 matching lines @@
                   WallpaperUtil.saveToSyncStorage(
                       Constants.AccessSyncSurpriseMeEnabledKey,
                       items[Constants.AccessLocalSurpriseMeEnabledKey]);
                   if (items[Constants.AccessLocalSurpriseMeEnabledKey]) {
                     onSurpriseMeEnabled();
                   }
                 }
               });
             }
           });
+
+          // Prefer Third party app name from sync filesystem, but if sync theme
+          // is disabled, use the value from local filesystem.
+          Constants.WallpaperSyncStorage.get(
+              Constants.AccessSyncThirdPartyAppName, function(items) {
+            if (items.hasOwnProperty(Constants.AccessSyncThirdPartyAppName) &&
+                items[Constants.AccessSyncThirdPartyAppName]) {
+              $('wallpaper-set-by-message').textContent =
+                  loadTimeData.getStringF('currentWallpaperSetByMessage',
+                  items[Constants.AccessSyncThirdPartyAppName]);
+              $('wallpaper-grid').classList.add('small');
+            } else {
+              $('wallpaper-grid').classList.remove('small');
+            }
+          });
+
         } else {
           Constants.WallpaperLocalStorage.get(
               Constants.AccessLocalSurpriseMeEnabledKey, function(items) {
             if (items.hasOwnProperty(
                 Constants.AccessLocalSurpriseMeEnabledKey)) {
               if (items[Constants.AccessLocalSurpriseMeEnabledKey]) {
                 onSurpriseMeEnabled();
               }
             }
           });
+
+          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');
+            }
+          });
         }
       });
 
       window.addEventListener('offline', function() {
         chrome.wallpaperPrivate.getOfflineWallpaperList(function(lists) {
           if (!self.downloadedListMap_)
             self.downloadedListMap_ = {};
           for (var i = 0; i < lists.length; i++) {
             self.downloadedListMap_[lists[i]] = true;
           }
@@ skipping 188 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.
+    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;
       }
     }
   };
 
 })();