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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #include "components/user_manager/user_manager.h" 127 #include "components/user_manager/user_manager.h"
128 #include "policy/policy_constants.h" 128 #include "policy/policy_constants.h"
129 #include "ui/chromeos/accessibility_types.h" 129 #include "ui/chromeos/accessibility_types.h"
130 #include "ui/gfx/image/image_skia.h" 130 #include "ui/gfx/image/image_skia.h"
131 #endif // defined(OS_CHROMEOS) 131 #endif // defined(OS_CHROMEOS)
132 132
133 #if defined(OS_CHROMEOS) && !defined(USE_ATHENA) 133 #if defined(OS_CHROMEOS) && !defined(USE_ATHENA)
134 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 134 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
135 #endif 135 #endif
136 136
137 #if defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
138 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
139 #endif
140
137 #if defined(OS_WIN) 141 #if defined(OS_WIN)
138 #include "chrome/browser/extensions/settings_api_helpers.h" 142 #include "chrome/browser/extensions/settings_api_helpers.h"
139 #include "chrome/installer/util/auto_launch_util.h" 143 #include "chrome/installer/util/auto_launch_util.h"
140 #include "content/public/browser/browser_url_handler.h" 144 #include "content/public/browser/browser_url_handler.h"
141 #endif // defined(OS_WIN) 145 #endif // defined(OS_WIN)
142 146
143 #if defined(ENABLE_SERVICE_DISCOVERY) 147 #if defined(ENABLE_SERVICE_DISCOVERY)
144 #include "chrome/browser/local_discovery/privet_notifications.h" 148 #include "chrome/browser/local_discovery/privet_notifications.h"
145 #endif 149 #endif
146 150
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 { "translateEnableTranslate", 368 { "translateEnableTranslate",
365 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, 369 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
366 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 370 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
367 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, 371 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
368 { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, 372 { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
369 { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, 373 { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
370 #else 374 #else
371 { "themes", IDS_THEMES_GROUP_NAME }, 375 { "themes", IDS_THEMES_GROUP_NAME },
372 #endif 376 #endif
373 { "themesReset", IDS_THEMES_RESET_BUTTON }, 377 { "themesReset", IDS_THEMES_RESET_BUTTON },
378 #if defined(OS_CHROMEOS)
379 { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION },
380 #endif
374 { "accessibilityTitle", 381 { "accessibilityTitle",
375 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 382 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
376 { "accessibilityFeaturesLink", 383 { "accessibilityFeaturesLink",
377 IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK }, 384 IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK },
378 #if defined(OS_CHROMEOS) 385 #if defined(OS_CHROMEOS)
379 { "accessibilityExplanation", 386 { "accessibilityExplanation",
380 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION }, 387 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION },
381 { "accessibilitySettings", 388 { "accessibilitySettings",
382 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS }, 389 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS },
383 { "accessibilityHighContrast", 390 { "accessibilityHighContrast",
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 664
658 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser()); 665 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());
659 666
660 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings()); 667 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
661 668
662 values->SetBoolean("websiteSettingsManagerEnabled", 669 values->SetBoolean("websiteSettingsManagerEnabled",
663 CommandLine::ForCurrentProcess()->HasSwitch( 670 CommandLine::ForCurrentProcess()->HasSwitch(
664 switches::kEnableWebsiteSettingsManager)); 671 switches::kEnableWebsiteSettingsManager));
665 672
666 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); 673 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
674
675 #if defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
676 values->SetBoolean(
677 "showWakeOnWifi",
678 !CommandLine::ForCurrentProcess()->HasSwitch(
679 chromeos::switches::kDisableWakeOnWifi));
680 #endif // defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
667 } 681 }
668 682
669 #if defined(ENABLE_PRINT_PREVIEW) 683 #if defined(ENABLE_PRINT_PREVIEW)
670 void BrowserOptionsHandler::RegisterCloudPrintValues( 684 void BrowserOptionsHandler::RegisterCloudPrintValues(
671 base::DictionaryValue* values) { 685 base::DictionaryValue* values) {
672 values->SetString("cloudPrintOptionLabel", 686 values->SetString("cloudPrintOptionLabel",
673 l10n_util::GetStringFUTF16( 687 l10n_util::GetStringFUTF16(
674 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 688 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
675 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 689 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
676 } 690 }
(...skipping 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after
2090 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2104 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2091 const policy::PolicyMap& previous, 2105 const policy::PolicyMap& previous,
2092 const policy::PolicyMap& current) { 2106 const policy::PolicyMap& current) {
2093 std::set<std::string> different_keys; 2107 std::set<std::string> different_keys;
2094 current.GetDifferingKeys(previous, &different_keys); 2108 current.GetDifferingKeys(previous, &different_keys);
2095 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2109 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2096 SetupMetricsReportingCheckbox(); 2110 SetupMetricsReportingCheckbox();
2097 } 2111 }
2098 2112
2099 } // namespace options 2113 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698