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

chrome/browser/ui/webui/options2/options_ui2.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 59 matching lines @@
 #include "chrome/browser/ui/webui/options2/chromeos/language_hangul_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/language_mozc_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/language_pinyin_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/pointer_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"
 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h"
 #endif
 
+#if defined(OS_CHROMEOS) && defined(USE_ASH)
+#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"
+#endif
+
 #if defined(USE_NSS)
 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
 #endif
 
 using content::RenderViewHost;
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace options2 {
 
@@ skipping 129 matching lines @@
       localized_strings,
       new chromeos::options2::VirtualKeyboardManagerHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options2::ProxyHandler());
   AddOptionsPageUIHandler(
       localized_strings,
       new chromeos::options2::ChangePictureOptionsHandler());
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::options2::StatsOptionsHandler());
 #endif
+#if defined(OS_CHROMEOS) && defined(USE_ASH)
+  AddOptionsPageUIHandler(
+      localized_strings,
+      new chromeos::options2::SetWallpaperOptionsHandler());
+#endif
 #if defined(USE_NSS)
   AddOptionsPageUIHandler(localized_strings, new CertificateManagerHandler());
 #endif
   AddOptionsPageUIHandler(localized_strings, new HandlerOptionsHandler());
 
   // |localized_strings| ownership is taken over by this constructor.
   OptionsUIHTMLSource* html_source =
       new OptionsUIHTMLSource(localized_strings);
 
   // Set up the chrome://settings-frame/ source.
@@ skipping 101 matching lines @@
       WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
 #else
   command_line_string =
       CommandLine::ForCurrentProcess()->GetCommandLineString();
 #endif
 
   render_view_host->SetWebUIProperty("commandLineString", command_line_string);
 }
 
 }  // namespace options2