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');
-    }
+    // Always prefer the value from local filesystem to avoid the time window
+    // of setting the third party app name and the third party wallpaper.
+    var getThirdPartyAppName = function(callback) {
+      Constants.WallpaperLocalStorage.get(
+          Constants.AccessLocalWallpaperInfoKey, function(items) {
+        var localInfo = items[Constants.AccessLocalWallpaperInfoKey];
+        if (localInfo && localInfo.hasOwnProperty('appName'))
+          callback(localInfo.appName);
+        else if (loadTimeData.valueExists('wallpaperAppName'))
+          callback(str('wallpaperAppName'));
+        else
+          callback('');
+      });
+    };
+
+    getThirdPartyAppName(function(appName) {
+      if (!!appName) {
+        $('wallpaper-set-by-message').textContent = loadTimeData.getStringF(
+          'currentWallpaperSetByMessage', appName);
+        $('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;
@@ skipping 103 matching lines @@
       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.onWallpaperChanged_(null, null);
-        WallpaperUtil.saveWallpaperInfo('', '',
-                                        Constants.WallpaperSourceEnum.Default);
+        WallpaperUtil.saveWallpaperInfo(
+            '', '', Constants.WallpaperSourceEnum.Default, '');
       } 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 161 matching lines @@
             }, errorHandler);
           }, errorHandler);
         };
         this.wallpaperDirs_.getDirectory(
             Constants.WallpaperDirNameEnum.ORIGINAL, success, errorHandler);
         break;
       case Constants.WallpaperSourceEnum.OEM:
         // Resets back to default wallpaper.
         chrome.wallpaperPrivate.resetWallpaper();
         this.onWallpaperChanged_(selectedItem, selectedItem.baseURL);
-        WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout,
-                                        selectedItem.source);
+        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.onWallpaperChanged_(selectedItem, wallpaperURL);
-            WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout,
-                                            selectedItem.source);
+            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();
           self.progressManager_.reset(self.wallpaperRequest_, selectedGridItem);
 
           var onSuccess = function(xhr) {
             var image = xhr.response;
             chrome.wallpaperPrivate.setWallpaper(image, selectedItem.layout,
                 wallpaperURL,
                 function() {
                   self.progressManager_.hideProgressBar(selectedGridItem);
 
                   if (chrome.runtime.lastError != undefined &&
                       chrome.runtime.lastError.message !=
                           str('canceledWallpaper')) {
                     self.showError_(chrome.runtime.lastError.message);
                   } else {
                     self.onWallpaperChanged_(selectedItem, wallpaperURL);
                   }
                 });
-            WallpaperUtil.saveWallpaperInfo(wallpaperURL, selectedItem.layout,
-                                            selectedItem.source);
+            WallpaperUtil.saveWallpaperInfo(
+                wallpaperURL, selectedItem.layout, selectedItem.source, '');
             self.wallpaperRequest_ = null;
           };
           var onFailure = function(status) {
             self.progressManager_.hideProgressBar(selectedGridItem);
             self.showError_(str('downloadFailed'));
             self.wallpaperRequest_ = null;
           };
           WallpaperUtil.fetchURL(wallpaperURL, 'arraybuffer', onSuccess,
                                  onFailure, self.wallpaperRequest_);
         });
@@ skipping 307 matching lines @@
     var onFinished = function(opt_thumbnail) {
       if (chrome.runtime.lastError != undefined &&
           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);
+        WallpaperUtil.saveWallpaperInfo(
+            fileName, layout, Constants.WallpaperSourceEnum.Custom, '');
       }
     };
 
     chrome.wallpaperPrivate.setCustomWallpaper(wallpaper, layout,
                                                generateThumbnail,
                                                fileName, onFinished);
   };
 
   /**
    * Handles the layout setting change of custom wallpaper.
@@ skipping 143 matching lines @@
       }
       this.wallpaperGrid_.dataModel = wallpapersDataModel;
       if (selectedItem) {
         this.wallpaperGrid_.selectedItem = selectedItem;
         this.wallpaperGrid_.activeItem = selectedItem;
       }
     }
   };
 
 })();