Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / chromeos / wallpaper_manager / js / event_page.js

diff --git a/src/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js b/src/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
index 0830878..5748921 100644 (file)
--- a/src/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
+++ b/src/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js
@@ -113,7 +113,7 @@ SurpriseWallpaper.prototype.updateSurpriseWallpaper = function(opt_rss) {
  */
 SurpriseWallpaper.prototype.updateRandomWallpaper_ = function() {
   var self = this;
-  Constants.WallpaperLocalStorage.get(
+  Constants.WallpaperSyncStorage.get(
       Constants.AccessLastSurpriseWallpaperChangedDate, function(items) {
     var dateString = new Date().toDateString();
     // At most one random wallpaper per day.
@@ -149,8 +149,8 @@ SurpriseWallpaper.prototype.setRandomWallpaper_ = function(dateString) {
         WallpaperUtil.saveToStorage(
             Constants.AccessLastSurpriseWallpaperChangedDate,
             dateString,
-            false);
-      }
+            true);
+      };
       WallpaperUtil.setOnlineWallpaper(wallpaperURL, wallpaper.default_layout,
           onSuccess, self.retryLater_.bind(self));
     }
@@ -190,7 +190,7 @@ SurpriseWallpaper.prototype.disable = function() {
   chrome.alarms.clearAll();
   // Makes last changed date invalid.
   WallpaperUtil.saveToStorage(Constants.AccessLastSurpriseWallpaperChangedDate,
-                              '', false);
+                              '', true);
 };
 
 /**
@@ -224,17 +224,15 @@ chrome.app.runtime.onLaunched.addListener(function() {
     frame: 'none',
     width: WALLPAPER_PICKER_WIDTH,
     height: WALLPAPER_PICKER_HEIGHT,
-    minWidth: WALLPAPER_PICKER_WIDTH,
-    maxWidth: WALLPAPER_PICKER_WIDTH,
-    minHeight: WALLPAPER_PICKER_HEIGHT,
-    maxHeight: WALLPAPER_PICKER_HEIGHT,
-    transparentBackground: true
+    resizable: false,
+    alphaEnabled: true
   }, function(w) {
     wallpaperPickerWindow = w;
     chrome.wallpaperPrivate.minimizeInactiveWindows();
     w.onClosed.addListener(function() {
       chrome.wallpaperPrivate.restoreMinimizedWindows();
     });
+    WallpaperUtil.testSendMessage('wallpaper-window-created');
   });
 });