Enable user change background image in settings page in Aura build.

chrome/browser/ui/webui/options2/browser_options_handler2.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/browser_options_handler2.h"
 
 #include <string>
 
+#include "ash/shell.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
@@ skipping 286 matching lines @@
     { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
     { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
     { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
 #else
     { "cloudPrintConnectorEnabledManageButton",
       IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON},
     { "cloudPrintConnectorEnablingButton",
       IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON },
     { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
 #endif
+#if defined(USE_AURA)

[flackr, 2012/03/07 20:50:28]

USE_ASH? For consistency.

[bshe, 2012/03/07 23:48:35]

Done.

+    { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
+#endif
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
     { "advancedSectionTitleBackground",
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND },
     { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE },
 #endif
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterCloudPrintStrings(localized_strings);
   RegisterTitle(localized_strings, "homePageOverlay",
@@ skipping 39 matching lines @@
       l10n_util::GetStringFUTF16(IDS_AUTOLAUNCH_TEXT,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
 #if defined(OS_CHROMEOS)
   if (chromeos::UserManager::Get()->user_is_logged_in()) {
     localized_strings->SetString("username",
         chromeos::UserManager::Get()->logged_in_user().email());
   }
 #endif
 
+  localized_strings->SetBoolean("compact_mode",
+      ash::Shell::GetInstance()->IsWindowModeCompact());

[flackr, 2012/03/07 20:50:28]

This (and the include of ash above) has to be in a #if defined(USE_ASH)

[bshe, 2012/03/07 23:48:35]

Done.

+
   // Pass along sync status early so it will be available during page init.
   localized_strings->Set("syncData", GetSyncStateDictionary());
 
   localized_strings->SetString("privacyLearnMoreURL",
                                chrome::kPrivacyLearnMoreURL);
 
   localized_strings->SetString(
       "languageSectionLabel",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
@@ skipping 1061 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2