| OLD | NEW |
| 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 new base::FundamentalValue(entry.manifest_type)))); | 509 new base::FundamentalValue(entry.manifest_type)))); |
| 510 } | 510 } |
| 511 } | 511 } |
| 512 #endif | 512 #endif |
| 513 | 513 |
| 514 #if !defined(OS_IOS) | 514 #if !defined(OS_IOS) |
| 515 void GetDeprecatedFeaturesMap( | 515 void GetDeprecatedFeaturesMap( |
| 516 ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) { | 516 ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) { |
| 517 // Maps feature tags as specified in policy to the corresponding switch to | 517 // Maps feature tags as specified in policy to the corresponding switch to |
| 518 // re-enable them. | 518 // re-enable them. |
| 519 // TODO(atwilson): Remove after 2015-04-30 per http://crbug.com/374782. | |
| 520 result->push_back(new StringMappingListPolicyHandler::MappingEntry( | |
| 521 "ShowModalDialog_EffectiveUntil20150430", | |
| 522 scoped_ptr<base::Value>(new base::StringValue( | |
| 523 switches::kEnableShowModalDialog)))); | |
| 524 } | 519 } |
| 525 #endif // !defined(OS_IOS) | 520 #endif // !defined(OS_IOS) |
| 526 | 521 |
| 527 } // namespace | 522 } // namespace |
| 528 | 523 |
| 529 void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) { | 524 void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) { |
| 530 #if defined(OS_CHROMEOS) | 525 #if defined(OS_CHROMEOS) |
| 531 if (user_manager::UserManager::IsInitialized()) { | 526 if (user_manager::UserManager::IsInitialized()) { |
| 532 const user_manager::User* user = | 527 const user_manager::User* user = |
| 533 user_manager::UserManager::Get()->GetActiveUser(); | 528 user_manager::UserManager::Get()->GetActiveUser(); |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 chrome_schema, | 791 chrome_schema, |
| 797 SCHEMA_STRICT, | 792 SCHEMA_STRICT, |
| 798 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, | 793 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, |
| 799 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); | 794 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); |
| 800 #endif // defined(OS_CHROMEOS) | 795 #endif // defined(OS_CHROMEOS) |
| 801 | 796 |
| 802 return handlers.Pass(); | 797 return handlers.Pass(); |
| 803 } | 798 } |
| 804 | 799 |
| 805 } // namespace policy | 800 } // namespace policy |
| OLD | NEW |