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

Side by Side Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 1849133006: Revert "ChromeOS: Add SystemTimezoneAutomaticDetection policy." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/policy/configuration_policy_handler_list_factory.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 { key::kWelcomePageOnOSUpgradeEnabled, 543 { key::kWelcomePageOnOSUpgradeEnabled,
544 prefs::kWelcomePageOnOSUpgradeEnabled, 544 prefs::kWelcomePageOnOSUpgradeEnabled,
545 base::Value::TYPE_BOOLEAN }, 545 base::Value::TYPE_BOOLEAN },
546 #endif // OS_WIN 546 #endif // OS_WIN
547 547
548 #if !defined(OS_ANDROID) 548 #if !defined(OS_ANDROID)
549 { key::kSuppressUnsupportedOSWarning, 549 { key::kSuppressUnsupportedOSWarning,
550 prefs::kSuppressUnsupportedOSWarning, 550 prefs::kSuppressUnsupportedOSWarning,
551 base::Value::TYPE_BOOLEAN }, 551 base::Value::TYPE_BOOLEAN },
552 #endif // !OS_ANDROID 552 #endif // !OS_ANDROID
553
554 #if defined(OS_CHROMEOS)
555 { key::kSystemTimezoneAutomaticDetection,
556 prefs::kSystemTimezoneAutomaticDetectionPolicy,
557 base::Value::TYPE_INTEGER },
558 #endif
559 }; 553 };
560 554
561 class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler { 555 class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler {
562 public: 556 public:
563 ForceSafeSearchPolicyHandler() 557 ForceSafeSearchPolicyHandler()
564 : TypeCheckingPolicyHandler(key::kForceSafeSearch, 558 : TypeCheckingPolicyHandler(key::kForceSafeSearch,
565 base::Value::TYPE_BOOLEAN) {} 559 base::Value::TYPE_BOOLEAN) {}
566 ~ForceSafeSearchPolicyHandler() override {} 560 ~ForceSafeSearchPolicyHandler() override {}
567 561
568 // ConfigurationPolicyHandler implementation: 562 // ConfigurationPolicyHandler implementation:
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 827 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
834 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 828 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
835 handlers->AddHandler(make_scoped_ptr( 829 handlers->AddHandler(make_scoped_ptr(
836 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 830 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
837 #endif // defined(OS_CHROMEOS) 831 #endif // defined(OS_CHROMEOS)
838 832
839 return handlers; 833 return handlers;
840 } 834 }
841 835
842 } // namespace policy 836 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/timezone_resolver_manager.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698