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

Side by Side Diff: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

Issue 21133012: Login screen and Guest mode should use device owner preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict. Created 7 years, 4 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/chromeos/policy/device_policy_decoder_chromeos.h" 5 #include "chrome/browser/chromeos/policy/device_policy_decoder_chromeos.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 if (policy.system_timezone().has_timezone()) { 562 if (policy.system_timezone().has_timezone()) {
563 policies->Set(key::kSystemTimezone, 563 policies->Set(key::kSystemTimezone,
564 POLICY_LEVEL_MANDATORY, 564 POLICY_LEVEL_MANDATORY,
565 POLICY_SCOPE_MACHINE, 565 POLICY_SCOPE_MACHINE,
566 Value::CreateStringValue( 566 Value::CreateStringValue(
567 policy.system_timezone().timezone()), 567 policy.system_timezone().timezone()),
568 NULL); 568 NULL);
569 } 569 }
570 } 570 }
571 571
572 if (policy.has_use_24hour_clock()) {
573 if (policy.use_24hour_clock().has_use_24hour_clock()) {
574 policies->Set(key::kSystemUse24HourClock,
575 POLICY_LEVEL_MANDATORY,
576 POLICY_SCOPE_MACHINE,
577 Value::CreateBooleanValue(
578 policy.use_24hour_clock().use_24hour_clock()),
579 NULL);
580 }
581 }
582
572 if (policy.has_allow_redeem_offers()) { 583 if (policy.has_allow_redeem_offers()) {
573 const em::AllowRedeemChromeOsRegistrationOffersProto& container( 584 const em::AllowRedeemChromeOsRegistrationOffersProto& container(
574 policy.allow_redeem_offers()); 585 policy.allow_redeem_offers());
575 if (container.has_allow_redeem_offers()) { 586 if (container.has_allow_redeem_offers()) {
576 policies->Set(key::kDeviceAllowRedeemChromeOsRegistrationOffers, 587 policies->Set(key::kDeviceAllowRedeemChromeOsRegistrationOffers,
577 POLICY_LEVEL_MANDATORY, 588 POLICY_LEVEL_MANDATORY,
578 POLICY_SCOPE_MACHINE, 589 POLICY_SCOPE_MACHINE,
579 Value::CreateBooleanValue( 590 Value::CreateBooleanValue(
580 container.allow_redeem_offers()), 591 container.allow_redeem_offers()),
581 NULL); 592 NULL);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 DecodeLoginPolicies(policy, policies); 665 DecodeLoginPolicies(policy, policies);
655 DecodeKioskPolicies(policy, policies, install_attributes); 666 DecodeKioskPolicies(policy, policies, install_attributes);
656 DecodeNetworkPolicies(policy, policies, install_attributes); 667 DecodeNetworkPolicies(policy, policies, install_attributes);
657 DecodeReportingPolicies(policy, policies); 668 DecodeReportingPolicies(policy, policies);
658 DecodeAutoUpdatePolicies(policy, policies); 669 DecodeAutoUpdatePolicies(policy, policies);
659 DecodeAccessibilityPolicies(policy, policies); 670 DecodeAccessibilityPolicies(policy, policies);
660 DecodeGenericPolicies(policy, policies); 671 DecodeGenericPolicies(policy, policies);
661 } 672 }
662 673
663 } // namespace policy 674 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/chromeos/settings/cros_settings_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698