Chromium Code Reviews| 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..416667f691306468ab3ff9d6e7904ccbcc90ee2c 100644 |
| --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc |
| +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc |
| @@ -6,6 +6,7 @@ |
| #include <string> |
| +#include "ash/shell.h" |
|
flackr
2012/03/08 01:19:59
This too ^
bshe
2012/03/08 03:19:24
Done.
|
| #include "base/basictypes.h" |
| #include "base/bind.h" |
| #include "base/bind_helpers.h" |
| @@ -312,6 +313,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 +375,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()); |