Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6535)

Unified Diff: chrome/browser/resources/options2/options.js

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options2/options.js
diff --git a/chrome/browser/resources/options2/options.js b/chrome/browser/resources/options2/options.js
index 5dc7ff42cb4ff5973cd2ed20f1ca2a5e1c1b196b..2447d324cd47edc92a4bd3132b4a30ca302031c8 100644
--- a/chrome/browser/resources/options2/options.js
+++ b/chrome/browser/resources/options2/options.js
@@ -164,6 +164,15 @@ function load() {
LanguageOptions.getInstance());
}
}
+
+<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
+ if (SetWallpaperOptions) {
+ OptionsPage.registerOverlay(SetWallpaperOptions.getInstance(),
+ BrowserOptions.getInstance(),
+ [$('set-wallpaper')]);
+ }
+</if>
+
if (!cr.isWindows && !cr.isMac) {
OptionsPage.registerOverlay(CertificateBackupOverlay.getInstance(),
CertificateManager.getInstance());
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | chrome/browser/resources/options2/options_bundle.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698