| Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| index 02e3b3037399df610072d8d78013df151a72616f..e374a92bfa4cbebabc9825dcc4614a43f0918aac 100644
|
| --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| @@ -76,6 +76,10 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| +#if defined(USE_ASH)
|
| +#include "ash/shell.h"
|
| +#endif
|
| +
|
| #if !defined(OS_CHROMEOS)
|
| #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
|
| #include "chrome/browser/ui/webui/options2/advanced_options_utils2.h"
|
| @@ -312,6 +316,9 @@ void BrowserOptionsHandler::GetLocalizedValues(
|
| IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON },
|
| { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
|
| #endif
|
| +#if defined(USE_ASH)
|
| + { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
|
| +#endif
|
| #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
|
| { "advancedSectionTitleBackground",
|
| IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND },
|
| @@ -371,6 +378,11 @@ void BrowserOptionsHandler::GetLocalizedValues(
|
| }
|
| #endif
|
|
|
| +#if defined(USE_ASH)
|
| + localized_strings->SetBoolean("compact_mode",
|
| + ash::Shell::GetInstance()->IsWindowModeCompact());
|
| +#endif
|
| +
|
| // Pass along sync status early so it will be available during page init.
|
| localized_strings->Set("syncData", GetSyncStateDictionary());
|
|
|
|
|