Sync 3rd party wallpaper app name

chrome/browser/resources/chromeos/wallpaper_manager/js/util.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.
 
 var WallpaperUtil = {
   strings: null,  // Object that contains all the flags
   syncFs: null,   // syncFileSystem handler
   webkitFs: null  // webkitFileSystem handler
 };
 
@@ skipping 230 matching lines @@
     if (!wallpaperFilename) {
       console.error('wallpaperFilename is not provided.');
       return;
     }
     if (!wallpaperLayout)
       wallpaperLayout = 'CENTER_CROPPED';
     fs.root.getFile(wallpaperFilename, {create: false}, function(fileEntry) {
       fileEntry.file(function(file) {
         var reader = new FileReader();
         reader.onloadend = function() {
-          chrome.wallpaperPrivate.setCustomWallpaper(
-              reader.result,
-              wallpaperLayout,
-              true,
-              wallpaperFilename,
-              function(thumbnailData) {
-                // TODO(ranj): Ignore 'canceledWallpaper' error.
-                if (chrome.runtime.lastError) {
-                  console.error(chrome.runtime.lastError.message);
-                  return;
-                }
-                WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
-                    reader.result, Constants.WallpaperDirNameEnum.ORIGINAL);
-                WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
-                    thumbnailData, Constants.WallpaperDirNameEnum.THUMBNAIL);
-                if (onSuccess)
-                  onSuccess();
-              });
+          Constants.WallpaperSyncStorage.get(

[tbarzic, 2016/02/02 20:59:38]

pass the app name as a function param (as filename and layout are)

[xdai1, 2016/02/04 01:46:33]

Done.

+              Constants.AccessSyncThirdPartyAppName, function(items) {
+            var thirdPartyAppName = '';
+            if (items.hasOwnProperty(Constants.AccessSyncThirdPartyAppName))
+              thirdPartyAppName = items[Constants.AccessSyncThirdPartyAppName];
+            chrome.wallpaperPrivate.setCustomWallpaper(
+                reader.result,
+                wallpaperLayout,
+                true,
+                wallpaperFilename,
+                thirdPartyAppName,
+                function(thumbnailData) {
+                  // TODO(ranj): Ignore 'canceledWallpaper' error.
+                  if (chrome.runtime.lastError) {
+                    console.error(chrome.runtime.lastError.message);
+                    return;
+                  }
+
+                  // If it's a custom wallpaper (i.e., not set by a third party
+                  // app), it should be stored into the local filesystem.
+                  if (!thirdPartyAppName) {
+                    WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
+                        reader.result, Constants.WallpaperDirNameEnum.ORIGINAL);
+                    WallpaperUtil.storeWallpaperToLocalFS(wallpaperFilename,
+                        thumbnailData,
+                        Constants.WallpaperDirNameEnum.THUMBNAIL);
+                    WallpaperUtil.clearThirdPartyAppName();

[tbarzic, 2016/02/02 20:59:38]

the correct value should already be set at this point, so remove this

+                  }
+                  if (onSuccess)
+                    onSuccess();
+            });
+          });
         };
         reader.readAsArrayBuffer(file);
       }, WallpaperUtil.onFileSystemError);
     }, function(e) {}  // fail to read file, expected due to download delay
     );
   };
   WallpaperUtil.requestSyncFS(setWallpaperFromSyncCallback);
 };
 
 /**
+ * Save the third party wallpaper app name to local & sync filesystem.
+ * @param {string} appname The third party wallpaper extension or app's name.
+ */
+WallpaperUtil.saveThirdPartyAppName = function(appname) {
+  WallpaperUtil.saveToLocalStorage(Constants.AccessLocalThirdPartyAppName,
+                                   appname, function() {
+    WallpaperUtil.saveToSyncStorage(Constants.AccessSyncThirdPartyAppName,
+                                    appname);
+});
+};
+
+/**
+ * Clear the third party wallpaper app name from local & sync filesystem.
+ */
+WallpaperUtil.clearThirdPartyAppName = function() {
+  WallpaperUtil.saveThirdPartyAppName('');
+};
+
+/**
  * Saves value to local storage that associates with key.
  * @param {string} key The key that associates with value.
  * @param {string} value The value to save to local storage.
  * @param {function=} opt_callback The callback on success.
  */
 WallpaperUtil.saveToLocalStorage = function(key, value, opt_callback) {
   var items = {};
   items[key] = value;
   Constants.WallpaperLocalStorage.set(items, opt_callback);
 };
@@ skipping 85 matching lines @@
       onSuccess();
       return;
     }
 
     self.fetchURL(url, 'arraybuffer', function(xhr) {
       if (xhr.response != null) {
         chrome.wallpaperPrivate.setWallpaper(xhr.response, layout, url,
                                              onSuccess);
         self.saveWallpaperInfo(url, layout,
                                Constants.WallpaperSourceEnum.Online);
+        WallpaperUtil.clearThirdPartyAppName();
       } else {
         onFailure();
       }
     }, onFailure);
   });
 };
 
 /**
  * Runs chrome.test.sendMessage in test environment. Does nothing if running
  * in production environment.
  *
  * @param {string} message Test message to send.
  */
 WallpaperUtil.testSendMessage = function(message) {
   var test = chrome.test || window.top.chrome.test;
   if (test)
     test.sendMessage(message);
 };