Chromium Code Reviews| 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 16 matching lines...) Expand all Loading... | |
| 27 #include "policy/policy_constants.h" | 27 #include "policy/policy_constants.h" |
| 28 | 28 |
| 29 #if !defined(OS_IOS) | 29 #if !defined(OS_IOS) |
| 30 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handle r.h" | 30 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handle r.h" |
| 31 #include "chrome/browser/extensions/policy_handlers.h" | 31 #include "chrome/browser/extensions/policy_handlers.h" |
| 32 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" | 32 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" |
| 33 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" | 33 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" |
| 34 #include "chrome/browser/policy/javascript_policy_handler.h" | 34 #include "chrome/browser/policy/javascript_policy_handler.h" |
| 35 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" | 35 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" |
| 36 #include "chrome/browser/sync/sync_policy_handler.h" | 36 #include "chrome/browser/sync/sync_policy_handler.h" |
| 37 #include "content/public/common/renderer_preferences.h" | |
| 37 #include "extensions/browser/pref_names.h" | 38 #include "extensions/browser/pref_names.h" |
| 38 #include "extensions/common/manifest.h" | 39 #include "extensions/common/manifest.h" |
| 39 #endif | 40 #endif |
| 40 | 41 |
| 41 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
| 42 #include "ash/magnifier/magnifier_constants.h" | 43 #include "ash/magnifier/magnifier_constants.h" |
| 43 #include "chrome/browser/chromeos/login/user.h" | 44 #include "chrome/browser/chromeos/login/user.h" |
| 44 #include "chrome/browser/chromeos/login/user_manager.h" | 45 #include "chrome/browser/chromeos/login/user_manager.h" |
| 45 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " | 46 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " |
| 46 #include "chromeos/dbus/power_policy_controller.h" | 47 #include "chromeos/dbus/power_policy_controller.h" |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 484 #if !defined(OS_IOS) | 485 #if !defined(OS_IOS) |
| 485 // Mapping from extension type names to Manifest::Type. | 486 // Mapping from extension type names to Manifest::Type. |
| 486 StringToIntEnumListPolicyHandler::MappingEntry kExtensionAllowedTypesMap[] = { | 487 StringToIntEnumListPolicyHandler::MappingEntry kExtensionAllowedTypesMap[] = { |
| 487 { "extension", extensions::Manifest::TYPE_EXTENSION }, | 488 { "extension", extensions::Manifest::TYPE_EXTENSION }, |
| 488 { "theme", extensions::Manifest::TYPE_THEME }, | 489 { "theme", extensions::Manifest::TYPE_THEME }, |
| 489 { "user_script", extensions::Manifest::TYPE_USER_SCRIPT }, | 490 { "user_script", extensions::Manifest::TYPE_USER_SCRIPT }, |
| 490 { "hosted_app", extensions::Manifest::TYPE_HOSTED_APP }, | 491 { "hosted_app", extensions::Manifest::TYPE_HOSTED_APP }, |
| 491 { "legacy_packaged_app", extensions::Manifest::TYPE_LEGACY_PACKAGED_APP }, | 492 { "legacy_packaged_app", extensions::Manifest::TYPE_LEGACY_PACKAGED_APP }, |
| 492 { "platform_app", extensions::Manifest::TYPE_PLATFORM_APP }, | 493 { "platform_app", extensions::Manifest::TYPE_PLATFORM_APP }, |
| 493 }; | 494 }; |
| 495 | |
| 496 // Maps feature tags as specified in policy to the corresponding enum value. | |
| 497 StringToIntEnumListPolicyHandler::MappingEntry | |
|
Andrew T Wilson (Slow)
2014/05/08 11:32:45
BTW, should add a TODO + a crbug entry to remove t
Mattias Nissler (ping if slow)
2014/05/09 16:38:27
Adam, would you like to track this as part of http
| |
| 498 kEnableDeprecatedWebPlatformFeaturesMap[] = { | |
| 499 {"ShowModalDialog", | |
|
Mattias Nissler (ping if slow)
2014/05/06 14:31:15
We should talk some more about the naming - do we
Andrew T Wilson (Slow)
2014/05/08 11:32:45
If people are going to stay on old versions to kee
Mattias Nissler (ping if slow)
2014/05/09 16:38:27
That's certainly a risk, but they'd have to retain
| |
| 500 content::RENDERER_PREFERENCES_DEPRECATED_FEATURE_SHOW_MODAL_DIALOG}, | |
| 501 }; | |
| 494 #endif // !defined(OS_IOS) | 502 #endif // !defined(OS_IOS) |
| 495 | 503 |
| 496 } // namespace | 504 } // namespace |
| 497 | 505 |
| 498 void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) { | 506 void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) { |
| 499 #if defined(OS_CHROMEOS) | 507 #if defined(OS_CHROMEOS) |
| 500 if (chromeos::UserManager::IsInitialized()) { | 508 if (chromeos::UserManager::IsInitialized()) { |
| 501 const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser(); | 509 const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser(); |
| 502 if (user) | 510 if (user) |
| 503 parameters->user_id_hash = user->username_hash(); | 511 parameters->user_id_hash = user->username_hash(); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 554 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 562 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 555 new extensions::ExtensionURLPatternListPolicyHandler( | 563 new extensions::ExtensionURLPatternListPolicyHandler( |
| 556 key::kExtensionInstallSources, | 564 key::kExtensionInstallSources, |
| 557 extensions::pref_names::kAllowedInstallSites))); | 565 extensions::pref_names::kAllowedInstallSites))); |
| 558 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 566 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 559 new StringToIntEnumListPolicyHandler( | 567 new StringToIntEnumListPolicyHandler( |
| 560 key::kExtensionAllowedTypes, | 568 key::kExtensionAllowedTypes, |
| 561 extensions::pref_names::kAllowedTypes, | 569 extensions::pref_names::kAllowedTypes, |
| 562 kExtensionAllowedTypesMap, | 570 kExtensionAllowedTypesMap, |
| 563 kExtensionAllowedTypesMap + arraysize(kExtensionAllowedTypesMap)))); | 571 kExtensionAllowedTypesMap + arraysize(kExtensionAllowedTypesMap)))); |
| 572 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | |
| 573 new StringToIntEnumListPolicyHandler( | |
| 574 key::kEnableDeprecatedWebPlatformFeatures, | |
| 575 prefs::kEnableDeprecatedWebPlatformFeatures, | |
| 576 kEnableDeprecatedWebPlatformFeaturesMap, | |
| 577 kEnableDeprecatedWebPlatformFeaturesMap + | |
| 578 arraysize(kEnableDeprecatedWebPlatformFeaturesMap)))); | |
| 564 #endif // !defined(OS_IOS) | 579 #endif // !defined(OS_IOS) |
| 565 | 580 |
| 566 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) | 581 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) |
| 567 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 582 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 568 new DiskCacheDirPolicyHandler())); | 583 new DiskCacheDirPolicyHandler())); |
| 569 | 584 |
| 570 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 585 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 571 new extensions::NativeMessagingHostListPolicyHandler( | 586 new extensions::NativeMessagingHostListPolicyHandler( |
| 572 key::kNativeMessagingWhitelist, | 587 key::kNativeMessagingWhitelist, |
| 573 extensions::pref_names::kNativeMessagingWhitelist, | 588 extensions::pref_names::kNativeMessagingWhitelist, |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 733 #endif // defined(OS_CHROMEOS) | 748 #endif // defined(OS_CHROMEOS) |
| 734 | 749 |
| 735 #if defined(OS_ANDROID) || defined(OS_IOS) | 750 #if defined(OS_ANDROID) || defined(OS_IOS) |
| 736 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 751 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 737 new ManagedBookmarksPolicyHandler())); | 752 new ManagedBookmarksPolicyHandler())); |
| 738 #endif | 753 #endif |
| 739 return handlers.Pass(); | 754 return handlers.Pass(); |
| 740 } | 755 } |
| 741 | 756 |
| 742 } // namespace policy | 757 } // namespace policy |
| OLD | NEW |