| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index 6cd7245380864daf316a1121434b3a04fa3fa538..7adf16714d1d6cf3beda6ba1d02f74c64f4b17bc 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -133,6 +133,10 @@
|
| #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
|
| #endif
|
|
|
| +#if defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
|
| +#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
|
| +#endif
|
| +
|
| #if defined(OS_WIN)
|
| #include "chrome/browser/extensions/settings_api_helpers.h"
|
| #include "chrome/installer/util/auto_launch_util.h"
|
| @@ -370,6 +374,9 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| { "themes", IDS_THEMES_GROUP_NAME },
|
| #endif
|
| { "themesReset", IDS_THEMES_RESET_BUTTON },
|
| +#if defined(OS_CHROMEOS)
|
| + { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION },
|
| +#endif
|
| { "accessibilityTitle",
|
| IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
|
| { "accessibilityFeaturesLink",
|
| @@ -679,6 +686,13 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
|
| switches::kEnableWebsiteSettingsManager));
|
|
|
| values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
|
| +
|
| +#if defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
|
| + values->SetBoolean(
|
| + "showWakeOnWifi",
|
| + !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + chromeos::switches::kDisableWakeOnWifi));
|
| +#endif // defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
|
| }
|
|
|
| #if defined(ENABLE_PRINT_PREVIEW)
|
|
|