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

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

Issue 899113002: Manual revert of Timezone auto update option should be available by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
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 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 base::CommandLine::ForCurrentProcess()->HasSwitch( 674 base::CommandLine::ForCurrentProcess()->HasSwitch(
675 switches::kEnableWebsiteSettingsManager)); 675 switches::kEnableWebsiteSettingsManager));
676 676
677 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); 677 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
678 678
679 #if defined(OS_CHROMEOS) 679 #if defined(OS_CHROMEOS)
680 values->SetBoolean( 680 values->SetBoolean(
681 "showWakeOnWifi", 681 "showWakeOnWifi",
682 chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() && 682 chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() &&
683 chromeos::switches::WakeOnWifiEnabled()); 683 chromeos::switches::WakeOnWifiEnabled());
684 const bool have_disable_time_zone_tracking_option_switch = 684 const bool have_enable_time_zone_tracking_option_switch =
685 base::CommandLine::ForCurrentProcess()->HasSwitch( 685 base::CommandLine::ForCurrentProcess()->HasSwitch(
686 chromeos::switches::kDisableTimeZoneTrackingOption); 686 chromeos::switches::kEnableTimeZoneTrackingOption);
687 values->SetBoolean("enableTimeZoneTrackingOption", 687 values->SetBoolean("enableTimeZoneTrackingOption",
688 !have_disable_time_zone_tracking_option_switch && 688 have_enable_time_zone_tracking_option_switch &&
689 !chromeos::system::HasSystemTimezonePolicy()); 689 !chromeos::system::HasSystemTimezonePolicy());
690 #endif 690 #endif
691 } 691 }
692 692
693 #if defined(ENABLE_PRINT_PREVIEW) 693 #if defined(ENABLE_PRINT_PREVIEW)
694 void BrowserOptionsHandler::RegisterCloudPrintValues( 694 void BrowserOptionsHandler::RegisterCloudPrintValues(
695 base::DictionaryValue* values) { 695 base::DictionaryValue* values) {
696 values->SetString("cloudPrintOptionLabel", 696 values->SetString("cloudPrintOptionLabel",
697 l10n_util::GetStringFUTF16( 697 l10n_util::GetStringFUTF16(
698 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, 698 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL,
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, 2129 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
2130 const policy::PolicyMap& previous, 2130 const policy::PolicyMap& previous,
2131 const policy::PolicyMap& current) { 2131 const policy::PolicyMap& current) {
2132 std::set<std::string> different_keys; 2132 std::set<std::string> different_keys;
2133 current.GetDifferingKeys(previous, &different_keys); 2133 current.GetDifferingKeys(previous, &different_keys);
2134 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) 2134 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
2135 SetupMetricsReportingCheckbox(); 2135 SetupMetricsReportingCheckbox();
2136 } 2136 }
2137 2137
2138 } // namespace options 2138 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698