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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 1020763002: Revert "Hide lucid sleep setting in guest mode" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 675
676 values->SetBoolean("websiteSettingsManagerEnabled", 676 values->SetBoolean("websiteSettingsManagerEnabled",
677 base::CommandLine::ForCurrentProcess()->HasSwitch( 677 base::CommandLine::ForCurrentProcess()->HasSwitch(
678 switches::kEnableWebsiteSettingsManager)); 678 switches::kEnableWebsiteSettingsManager));
679 679
680 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); 680 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
681 681
682 #if defined(OS_CHROMEOS) 682 #if defined(OS_CHROMEOS)
683 values->SetBoolean( 683 values->SetBoolean(
684 "showWakeOnWifi", 684 "showWakeOnWifi",
685 !Profile::FromWebUI(web_ui())->IsGuestSession() &&
686 chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() && 685 chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() &&
687 chromeos::switches::WakeOnWifiEnabled()); 686 chromeos::switches::WakeOnWifiEnabled());
688 const bool have_disable_time_zone_tracking_option_switch = 687 const bool have_disable_time_zone_tracking_option_switch =
689 base::CommandLine::ForCurrentProcess()->HasSwitch( 688 base::CommandLine::ForCurrentProcess()->HasSwitch(
690 chromeos::switches::kDisableTimeZoneTrackingOption); 689 chromeos::switches::kDisableTimeZoneTrackingOption);
691 values->SetBoolean("enableTimeZoneTrackingOption", 690 values->SetBoolean("enableTimeZoneTrackingOption",
692 !have_disable_time_zone_tracking_option_switch && 691 !have_disable_time_zone_tracking_option_switch &&
693 !chromeos::system::HasSystemTimezonePolicy()); 692 !chromeos::system::HasSystemTimezonePolicy());
694 values->SetBoolean("resolveTimezoneByGeolocationInitialValue", 693 values->SetBoolean("resolveTimezoneByGeolocationInitialValue",
695 Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean( 694 Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean(
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after
2183 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2182 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2184 const policy::PolicyMap& previous, 2183 const policy::PolicyMap& previous,
2185 const policy::PolicyMap& current) { 2184 const policy::PolicyMap& current) {
2186 std::set<std::string> different_keys; 2185 std::set<std::string> different_keys;
2187 current.GetDifferingKeys(previous, &different_keys); 2186 current.GetDifferingKeys(previous, &different_keys);
2188 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2187 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2189 SetupMetricsReportingCheckbox(); 2188 SetupMetricsReportingCheckbox();
2190 } 2189 }
2191 2190
2192 } // namespace options 2191 } // namespace options
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698