Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

chrome/browser/resources/options2/options.js

 // Copyright (c) 2012 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 AddLanguageOverlay = options.AddLanguageOverlay;
 var AlertOverlay = options.AlertOverlay;
 var AutofillEditAddressOverlay = options.AutofillEditAddressOverlay;
 var AutofillEditCreditCardOverlay = options.AutofillEditCreditCardOverlay;
 var AutofillOptions = options.AutofillOptions;
 var BrowserOptions = options.BrowserOptions;
@@ skipping 146 matching lines @@
                         'languagePinyinPage'),
         LanguageOptions.getInstance());
     // Only use the VirtualKeyboardManager if the keyboard DOM elements (which
     // it will assume exists) are present (i.e. if we were built with
     // use_virtual_keyboard=1).
     if ($('language-options-virtual-keyboard')) {
       OptionsPage.registerOverlay(VirtualKeyboardManager.getInstance(),
                                   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());
     OptionsPage.registerOverlay(CertificateEditCaTrustOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateImportErrorOverlay.getInstance(),
                                 CertificateManager.getInstance());
     OptionsPage.registerOverlay(CertificateManager.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('certificatesManageButton')]);
@@ skipping 49 matching lines @@
   options.OptionsPage.willClose();
 };
 
 /**
  * Listener for the |popstate| event.
  * @param {Event} e The |popstate| event.
  */
 window.onpopstate = function(e) {
   options.OptionsPage.setState(e.state);
 };