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

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: 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 #include "components/user_manager/user_manager.h" 126 #include "components/user_manager/user_manager.h"
127 #include "policy/policy_constants.h" 127 #include "policy/policy_constants.h"
128 #include "ui/chromeos/accessibility_types.h" 128 #include "ui/chromeos/accessibility_types.h"
129 #include "ui/gfx/image/image_skia.h" 129 #include "ui/gfx/image/image_skia.h"
130 #endif // defined(OS_CHROMEOS) 130 #endif // defined(OS_CHROMEOS)
131 131
132 #if defined(OS_CHROMEOS) && !defined(USE_ATHENA) 132 #if defined(OS_CHROMEOS) && !defined(USE_ATHENA)
133 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 133 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
134 #endif 134 #endif
135 135
136 #if defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
137 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
138 #endif
139
136 #if defined(OS_WIN) 140 #if defined(OS_WIN)
137 #include "chrome/browser/extensions/settings_api_helpers.h" 141 #include "chrome/browser/extensions/settings_api_helpers.h"
138 #include "chrome/installer/util/auto_launch_util.h" 142 #include "chrome/installer/util/auto_launch_util.h"
139 #include "content/public/browser/browser_url_handler.h" 143 #include "content/public/browser/browser_url_handler.h"
140 #endif // defined(OS_WIN) 144 #endif // defined(OS_WIN)
141 145
142 #if defined(ENABLE_SERVICE_DISCOVERY) 146 #if defined(ENABLE_SERVICE_DISCOVERY)
143 #include "chrome/browser/local_discovery/privet_notifications.h" 147 #include "chrome/browser/local_discovery/privet_notifications.h"
144 #endif 148 #endif
145 149
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 { "translateEnableTranslate", 367 { "translateEnableTranslate",
364 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, 368 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
365 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 369 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
366 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, 370 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
367 { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, 371 { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
368 { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, 372 { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
369 #else 373 #else
370 { "themes", IDS_THEMES_GROUP_NAME }, 374 { "themes", IDS_THEMES_GROUP_NAME },
371 #endif 375 #endif
372 { "themesReset", IDS_THEMES_RESET_BUTTON }, 376 { "themesReset", IDS_THEMES_RESET_BUTTON },
377 #if defined(OS_CHROMEOS)
378 { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION },
379 #endif
373 { "accessibilityTitle", 380 { "accessibilityTitle",
374 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 381 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
375 { "accessibilityFeaturesLink", 382 { "accessibilityFeaturesLink",
376 IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK }, 383 IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK },
377 #if defined(OS_CHROMEOS) 384 #if defined(OS_CHROMEOS)
378 { "accessibilityExplanation", 385 { "accessibilityExplanation",
379 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION }, 386 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION },
380 { "accessibilitySettings", 387 { "accessibilitySettings",
381 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS }, 388 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS },
382 { "accessibilityHighContrast", 389 { "accessibilityHighContrast",
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 679
673 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser()); 680 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());
674 681
675 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings()); 682 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
676 683
677 values->SetBoolean("websiteSettingsManagerEnabled", 684 values->SetBoolean("websiteSettingsManagerEnabled",
678 CommandLine::ForCurrentProcess()->HasSwitch( 685 CommandLine::ForCurrentProcess()->HasSwitch(
679 switches::kEnableWebsiteSettingsManager)); 686 switches::kEnableWebsiteSettingsManager));
680 687
681 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); 688 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
689
690 #if defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
691 values->SetBoolean(
692 "showWakeOnWifi",
693 !CommandLine::ForCurrentProcess()->HasSwitch(
694 chromeos::switches::kDisableWakeOnWifi));
695 #endif // defined(OS_CHROMEOS) && !defined(DISABLE_WAKE_ON_WIFI)
682 } 696 }
683 697
684 #if defined(ENABLE_PRINT_PREVIEW) 698 #if defined(ENABLE_PRINT_PREVIEW)
685 void BrowserOptionsHandler::RegisterCloudPrintValues( 699 void BrowserOptionsHandler::RegisterCloudPrintValues(
686 base::DictionaryValue* values) { 700 base::DictionaryValue* values) {
687 values->SetString("cloudPrintOptionLabel", 701 values->SetString("cloudPrintOptionLabel",
688 l10n_util::GetStringFUTF16( 702 l10n_util::GetStringFUTF16(
689 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 703 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
690 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 704 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
691 } 705 }
(...skipping 1379 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2085 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2072 const policy::PolicyMap& previous, 2086 const policy::PolicyMap& previous,
2073 const policy::PolicyMap& current) { 2087 const policy::PolicyMap& current) {
2074 std::set<std::string> different_keys; 2088 std::set<std::string> different_keys;
2075 current.GetDifferingKeys(previous, &different_keys); 2089 current.GetDifferingKeys(previous, &different_keys);
2076 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2090 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2077 SetupMetricsReportingCheckbox(); 2091 SetupMetricsReportingCheckbox();
2078 } 2092 }
2079 2093
2080 } // namespace options 2094 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698