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..99273e8a31a8b3ffe3e4ef74ab2b500b6d90fc04 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" |
| #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_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 }, |
| @@ -371,6 +375,9 @@ void BrowserOptionsHandler::GetLocalizedValues( |
| } |
| #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
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()); |