diff options
| author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:30:52 +0000 |
|---|---|---|
| committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 16:30:52 +0000 |
| commit | 31e2fa3175407be1ab1a85687c0b6285fcb92708 (patch) | |
| tree | 71bda88f9e5fcd6abfa1ddb879412501ab3b7359 | |
| parent | 44cddffaeb8eff387a2c158368af9db4f1c9606d (diff) | |
| download | chromium_src-31e2fa3175407be1ab1a85687c0b6285fcb92708.zip chromium_src-31e2fa3175407be1ab1a85687c0b6285fcb92708.tar.gz chromium_src-31e2fa3175407be1ab1a85687c0b6285fcb92708.tar.bz2 | |
Chrome OS wallpaper manager.
Rename transparentBackground -> alphaEnabled and set corresponding permissions.
This is in response to r288983.
BUG=403166
TEST=verify wallpaper picker works on Chrome OS.
R=bshe@chromium.org
Review URL: https://codereview.chromium.org/465113003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289316 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/wallpaper_manager/manifest.json | 1 |
2 files changed, 3 insertions, 2 deletions
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 3cbe93e..8f0821b 100644 --- a/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js +++ b/chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js @@ -150,7 +150,7 @@ SurpriseWallpaper.prototype.setRandomWallpaper_ = function(dateString) { Constants.AccessLastSurpriseWallpaperChangedDate, dateString, true); - } + }; WallpaperUtil.setOnlineWallpaper(wallpaperURL, wallpaper.default_layout, onSuccess, self.retryLater_.bind(self)); } @@ -225,7 +225,7 @@ chrome.app.runtime.onLaunched.addListener(function() { width: WALLPAPER_PICKER_WIDTH, height: WALLPAPER_PICKER_HEIGHT, resizable: false, - transparentBackground: true + alphaEnabled: true }, function(w) { wallpaperPickerWindow = w; chrome.wallpaperPrivate.minimizeInactiveWindows(); diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json b/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json index 7c82c2b..6122cd4 100644 --- a/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json +++ b/chrome/browser/resources/chromeos/wallpaper_manager/manifest.json @@ -12,6 +12,7 @@ }, "permissions": [ "alarms", + "app.window.alpha", "experimental", "storage", "unlimitedStorage", |