Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2698)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 811973002: Enable lucid sleep (wake on wi-fi SSID) and add to Privacy options. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7d807c6b06885335e4f50ed4f1a235863486ab00..e12d6d37e953cd695b972b6c776bc65d1bcace52 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -134,6 +134,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"
@@ -371,6 +375,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",
@@ -664,6 +671,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)

Powered by Google App Engine
This is Rietveld 408576698