Sync 3rd party wallpaper app name

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

Index: chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js b/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
index 800b25477dc1836503281fb8c58dd3c963345ed3..084a4bcf85ba6fbdfe870c557eb8753389cfa7e3 100644
--- a/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
+++ b/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
@@ -279,16 +279,25 @@ chrome.syncFileSystem.onFileStatusChanged.addListener(function(detail) {
               Constants.AccessLocalWallpaperInfoKey,
               function(items) {
                 var localData = items[Constants.AccessLocalWallpaperInfoKey];
-                if (localData && localData.url == detail.fileEntry.name &&
-                    localData.source == Constants.WallpaperSourceEnum.Custom) {
-                  WallpaperUtil.setCustomWallpaperFromSyncFS(localData.url,
-                                                             localData.layout);
-                } else if (!localData || localData.url !=
-                           detail.fileEntry.name.replace(
-                               Constants.CustomWallpaperThumbnailSuffix, '')) {
+                if (!localData) {
                   // localData might be null on a powerwashed device.
                   WallpaperUtil.storeWallpaperFromSyncFSToLocalFS(
                       detail.fileEntry);
+                } else if (localData.url == detail.fileEntry.name &&
+                    localData.source == Constants.WallpaperSourceEnum.Custom) {
+                  if (localData.hasOwnProperty('appName')) {
+                    WallpaperUtil.setCustomWallpaperFromSyncFS(
+                        localData.url, localData.layout, localData.appName);

[tbarzic, 2016/02/04 21:31:24]

I'd just use localData.appName || '' (instead of if (hasProperty(appName)) {set
with appName} else {set with ''})

Also, localData.appName === undefined would be a good signal that the wallpaper
in sync storage came from a device that does not yet support syncing third party
app name.

+                  } else {
+                    WallpaperUtil.setCustomWallpaperFromSyncFS(
+                        localData.url, localData.layout, '');
+                  }
+                } else if (localData.url != detail.fileEntry.name.replace(
+                    Constants.CustomWallpaperThumbnailSuffix, '') &&
+                    detail.fileEntry.name.indexOf(
+                        Constants.ThirdPartyWallpaperPrefix) == -1) {
+                  WallpaperUtil.storeWallpaperFromSyncFSToLocalFS(
+                      detail.fileEntry);
                 }
              });
         } else if (detail.action == 'deleted') {
@@ -319,7 +328,8 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
         // If the old wallpaper is a third party wallpaper we should remove it
         // from the local & sync file system to free space.
         var oldInfo = changes[Constants.AccessLocalWallpaperInfoKey].oldValue;
-        if (oldInfo.url.indexOf(Constants.ThirdPartyWallpaperPrefix) != -1) {
+        if (oldInfo &&
+            oldInfo.url.indexOf(Constants.ThirdPartyWallpaperPrefix) != -1) {
           WallpaperUtil.deleteWallpaperFromLocalFS(oldInfo.url);
           WallpaperUtil.deleteWallpaperFromSyncFS(oldInfo.url);
         }
@@ -354,7 +364,7 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
                 // storage are the same. If the synced value changed by sync
                 // service, they may different. In that case, change wallpaper
                 // to the one saved in sync storage and update the local value.
-                if (localInfo == undefined ||
+                if (!localInfo ||
                     localInfo.url != syncInfo.url ||
                     localInfo.layout != syncInfo.layout ||
                     localInfo.source != syncInfo.source) {
@@ -367,8 +377,13 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
                         syncInfo.layout, function() {}, function() {});
                   } else if (syncInfo.source ==
                              Constants.WallpaperSourceEnum.Custom) {
-                    WallpaperUtil.setCustomWallpaperFromSyncFS(syncInfo.url,
-                                                               syncInfo.layout);
+                    if (syncInfo.hasOwnProperty('appName')) {
+                      WallpaperUtil.setCustomWallpaperFromSyncFS(
+                          syncInfo.url, syncInfo.layout, syncInfo.appName);

[tbarzic, 2016/02/04 21:31:24]

How about:
WallpaperUtil.setCustomWallpaperFromSyncFS(url, layout, syncInfo.appName || '')

[xdai1, 2016/02/05 01:09:52]

As explained in WallpaperUtil.setCustomWallpaperFromSyncFS() function, I think
we might not need appName as a parameter. Revert it back.

+                    } else {
+                      WallpaperUtil.setCustomWallpaperFromSyncFS(
+                          syncInfo.url, syncInfo.layout, '');
+                    }
                   } else if (syncInfo.source ==
                               Constants.WallpaperSourceEnum.Default) {
                     chrome.wallpaperPrivate.resetWallpaper();
@@ -409,7 +424,7 @@ chrome.alarms.onAlarm.addListener(function() {
 });
 
 chrome.wallpaperPrivate.onWallpaperChangedBy3rdParty.addListener(function(
-    wallpaper, thumbnail, layout) {
+    wallpaper, thumbnail, layout, appName) {
   WallpaperUtil.saveToLocalStorage(
       Constants.AccessLocalSurpriseMeEnabledKey, false, function() {
     WallpaperUtil.saveToSyncStorage(Constants.AccessSyncSurpriseMeEnabledKey,
@@ -418,11 +433,10 @@ chrome.wallpaperPrivate.onWallpaperChangedBy3rdParty.addListener(function(
   SurpriseWallpaper.getInstance().disable();
 
   // Make third party wallpaper syncable through different devices.
-  // TODO(xdai): also sync the third party app name.
   var filename = Constants.ThirdPartyWallpaperPrefix + new Date().getTime();
   var thumbnailFilename = filename + Constants.CustomWallpaperThumbnailSuffix;
   WallpaperUtil.storeWallpaperToSyncFS(filename, wallpaper);
   WallpaperUtil.storeWallpaperToSyncFS(thumbnailFilename, thumbnail);
-  WallpaperUtil.saveWallpaperInfo(filename, layout,
-                                  Constants.WallpaperSourceEnum.Custom);
+  WallpaperUtil.saveWallpaperInfo(

[tbarzic, 2016/02/04 21:31:24]

Not introduced here, but might make for a good follow-up:
it looks like chrome.syncFileSystem.onFileStatusChanged listener depend on local
data being set, in which case this seems a bit racy.
Maybe update sync fs in a callback to saveWallpaperInfo?

[xdai1, 2016/02/05 01:09:52]

Might not true. It's the onChanged() event which is triggered by wallpaperInfo
change that sync down and set the custom/third party wallpaper.

[tbarzic, 2016/02/05 22:27:37]

Oh, yeah, syncFileSystem,onFileStatusChange only handles remote -> local
updates. D'oh.

+      filename, layout, Constants.WallpaperSourceEnum.Custom, appName);
 });