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

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

Issue 1071713004: Enable NPAPI if policy has plugin policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix GN Created 5 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
« no previous file with comments | « chrome/browser/policy/chrome_browser_policy_connector.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #endif 54 #endif
55 55
56 #if defined(ENABLE_EXTENSIONS) 56 #if defined(ENABLE_EXTENSIONS)
57 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handle r.h" 57 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handle r.h"
58 #include "chrome/browser/extensions/extension_management_constants.h" 58 #include "chrome/browser/extensions/extension_management_constants.h"
59 #include "chrome/browser/extensions/policy_handlers.h" 59 #include "chrome/browser/extensions/policy_handlers.h"
60 #include "extensions/browser/pref_names.h" 60 #include "extensions/browser/pref_names.h"
61 #include "extensions/common/manifest.h" 61 #include "extensions/common/manifest.h"
62 #endif 62 #endif
63 63
64 #if defined(ENABLE_PLUGINS)
65 #include "chrome/browser/plugins/enable_npapi_plugins_policy_handler.h"
66 #endif
67
64 namespace policy { 68 namespace policy {
65 69
66 namespace { 70 namespace {
67 71
68 // List of policy types to preference names. This is used for simple policies 72 // List of policy types to preference names. This is used for simple policies
69 // that directly map to a single preference. 73 // that directly map to a single preference.
70 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { 74 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
71 { key::kHomepageLocation, 75 { key::kHomepageLocation,
72 prefs::kHomePage, 76 prefs::kHomePage,
73 base::Value::TYPE_STRING }, 77 base::Value::TYPE_STRING },
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 make_scoped_ptr(new extensions::ExtensionURLPatternListPolicyHandler( 592 make_scoped_ptr(new extensions::ExtensionURLPatternListPolicyHandler(
589 key::kExtensionInstallSources, 593 key::kExtensionInstallSources,
590 extensions::pref_names::kAllowedInstallSites))); 594 extensions::pref_names::kAllowedInstallSites)));
591 handlers->AddHandler(make_scoped_ptr(new StringMappingListPolicyHandler( 595 handlers->AddHandler(make_scoped_ptr(new StringMappingListPolicyHandler(
592 key::kExtensionAllowedTypes, extensions::pref_names::kAllowedTypes, 596 key::kExtensionAllowedTypes, extensions::pref_names::kAllowedTypes,
593 base::Bind(GetExtensionAllowedTypesMap)))); 597 base::Bind(GetExtensionAllowedTypesMap))));
594 handlers->AddHandler(make_scoped_ptr( 598 handlers->AddHandler(make_scoped_ptr(
595 new extensions::ExtensionSettingsPolicyHandler(chrome_schema))); 599 new extensions::ExtensionSettingsPolicyHandler(chrome_schema)));
596 #endif 600 #endif
597 601
602 #if defined(ENABLE_PLUGINS)
603 handlers->AddHandler(make_scoped_ptr(new EnableNpapiPluginsPolicyHandler()));
604 #endif
605
598 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 606 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
599 handlers->AddHandler(make_scoped_ptr(new DiskCacheDirPolicyHandler())); 607 handlers->AddHandler(make_scoped_ptr(new DiskCacheDirPolicyHandler()));
600 608
601 handlers->AddHandler( 609 handlers->AddHandler(
602 make_scoped_ptr(new extensions::NativeMessagingHostListPolicyHandler( 610 make_scoped_ptr(new extensions::NativeMessagingHostListPolicyHandler(
603 key::kNativeMessagingWhitelist, 611 key::kNativeMessagingWhitelist,
604 extensions::pref_names::kNativeMessagingWhitelist, false))); 612 extensions::pref_names::kNativeMessagingWhitelist, false)));
605 handlers->AddHandler( 613 handlers->AddHandler(
606 make_scoped_ptr(new extensions::NativeMessagingHostListPolicyHandler( 614 make_scoped_ptr(new extensions::NativeMessagingHostListPolicyHandler(
607 key::kNativeMessagingBlacklist, 615 key::kNativeMessagingBlacklist,
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler( 752 handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler(
745 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT, 753 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT,
746 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 754 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
747 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 755 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
748 #endif // defined(OS_CHROMEOS) 756 #endif // defined(OS_CHROMEOS)
749 757
750 return handlers.Pass(); 758 return handlers.Pass();
751 } 759 }
752 760
753 } // namespace policy 761 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/chrome_browser_policy_connector.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698