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

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

Issue 197013007: Set drive as the default download folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes test failure and enables a new test Created 6 years, 9 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 "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"
11 #include "chrome/browser/net/proxy_policy_handler.h" 11 #include "chrome/browser/net/proxy_policy_handler.h"
12 #include "chrome/browser/profiles/incognito_mode_policy_handler.h" 12 #include "chrome/browser/profiles/incognito_mode_policy_handler.h"
13 #include "chrome/browser/search_engines/default_search_policy_handler.h" 13 #include "chrome/browser/search_engines/default_search_policy_handler.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "components/password_manager/core/common/password_manager_pref_names.h" 15 #include "components/password_manager/core/common/password_manager_pref_names.h"
16 #include "components/policy/core/browser/autofill_policy_handler.h" 16 #include "components/policy/core/browser/autofill_policy_handler.h"
17 #include "components/policy/core/browser/configuration_policy_handler.h" 17 #include "components/policy/core/browser/configuration_policy_handler.h"
18 #include "components/policy/core/browser/configuration_policy_handler_list.h" 18 #include "components/policy/core/browser/configuration_policy_handler_list.h"
19 #include "components/policy/core/browser/configuration_policy_handler_parameters .h"
19 #include "components/policy/core/browser/url_blacklist_policy_handler.h" 20 #include "components/policy/core/browser/url_blacklist_policy_handler.h"
20 #include "components/policy/core/common/policy_details.h" 21 #include "components/policy/core/common/policy_details.h"
21 #include "components/policy/core/common/policy_map.h" 22 #include "components/policy/core/common/policy_map.h"
22 #include "components/policy/core/common/policy_pref_names.h" 23 #include "components/policy/core/common/policy_pref_names.h"
23 #include "components/policy/core/common/schema.h" 24 #include "components/policy/core/common/schema.h"
24 #include "components/translate/core/common/translate_pref_names.h" 25 #include "components/translate/core/common/translate_pref_names.h"
25 #include "grit/component_strings.h" 26 #include "grit/component_strings.h"
26 #include "policy/policy_constants.h" 27 #include "policy/policy_constants.h"
27 28
28 #if !defined(OS_IOS) 29 #if !defined(OS_IOS)
29 #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"
30 #include "chrome/browser/extensions/policy_handlers.h" 31 #include "chrome/browser/extensions/policy_handlers.h"
31 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" 32 #include "chrome/browser/net/disk_cache_dir_policy_handler.h"
32 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" 33 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
33 #include "chrome/browser/policy/javascript_policy_handler.h" 34 #include "chrome/browser/policy/javascript_policy_handler.h"
34 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 35 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
35 #include "chrome/browser/sync/sync_policy_handler.h" 36 #include "chrome/browser/sync/sync_policy_handler.h"
36 #include "extensions/browser/pref_names.h" 37 #include "extensions/browser/pref_names.h"
37 #include "extensions/common/manifest.h" 38 #include "extensions/common/manifest.h"
38 #endif 39 #endif
39 40
40 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
41 #include "ash/magnifier/magnifier_constants.h" 42 #include "ash/magnifier/magnifier_constants.h"
43 #include "chrome/browser/chromeos/login/user.h"
44 #include "chrome/browser/chromeos/login/user_manager.h"
42 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 45 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
43 #include "chromeos/dbus/power_policy_controller.h" 46 #include "chromeos/dbus/power_policy_controller.h"
44 #endif 47 #endif
45 48
46 #if defined(OS_ANDROID) || defined(OS_IOS) 49 #if defined(OS_ANDROID) || defined(OS_IOS)
47 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h" 50 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h"
48 #endif 51 #endif
49 52
50 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 53 #if !defined(OS_ANDROID) && !defined(OS_IOS)
51 #include "chrome/browser/download/download_dir_policy_handler.h" 54 #include "chrome/browser/download/download_dir_policy_handler.h"
52 #endif 55 #endif
53 56
54 #if !defined(OS_MACOSX) && !defined(OS_IOS) 57 #if !defined(OS_MACOSX) && !defined(OS_IOS)
55 #include "apps/pref_names.h" 58 #include "apps/pref_names.h"
56 #endif 59 #endif
57 60
58 namespace policy { 61 namespace policy {
59 62
60 namespace { 63 namespace {
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 { "theme", extensions::Manifest::TYPE_THEME }, 485 { "theme", extensions::Manifest::TYPE_THEME },
483 { "user_script", extensions::Manifest::TYPE_USER_SCRIPT }, 486 { "user_script", extensions::Manifest::TYPE_USER_SCRIPT },
484 { "hosted_app", extensions::Manifest::TYPE_HOSTED_APP }, 487 { "hosted_app", extensions::Manifest::TYPE_HOSTED_APP },
485 { "legacy_packaged_app", extensions::Manifest::TYPE_LEGACY_PACKAGED_APP }, 488 { "legacy_packaged_app", extensions::Manifest::TYPE_LEGACY_PACKAGED_APP },
486 { "platform_app", extensions::Manifest::TYPE_PLATFORM_APP }, 489 { "platform_app", extensions::Manifest::TYPE_PLATFORM_APP },
487 }; 490 };
488 #endif // !defined(OS_IOS) 491 #endif // !defined(OS_IOS)
489 492
490 } // namespace 493 } // namespace
491 494
495 void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) {
496 #if defined(OS_CHROMEOS)
497 if (chromeos::UserManager::IsInitialized()) {
498 const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser();
499 if (user)
500 parameters->user_id_hash = user->username_hash();
501 }
502 #endif
503 }
504
492 scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList( 505 scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
493 const Schema& chrome_schema) { 506 const Schema& chrome_schema) {
494 scoped_ptr<ConfigurationPolicyHandlerList> handlers( 507 scoped_ptr<ConfigurationPolicyHandlerList> handlers(
495 new ConfigurationPolicyHandlerList(base::Bind(&GetChromePolicyDetails))); 508 new ConfigurationPolicyHandlerList(
509 base::Bind(&PopulatePolicyHandlerParameters),
510 base::Bind(&GetChromePolicyDetails)));
496 for (size_t i = 0; i < arraysize(kSimplePolicyMap); ++i) { 511 for (size_t i = 0; i < arraysize(kSimplePolicyMap); ++i) {
497 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 512 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
498 new SimplePolicyHandler(kSimplePolicyMap[i].policy_name, 513 new SimplePolicyHandler(kSimplePolicyMap[i].policy_name,
499 kSimplePolicyMap[i].preference_path, 514 kSimplePolicyMap[i].preference_path,
500 kSimplePolicyMap[i].value_type))); 515 kSimplePolicyMap[i].value_type)));
501 } 516 }
502 517
503 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 518 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
504 new AutofillPolicyHandler())); 519 new AutofillPolicyHandler()));
505 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 520 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 new StringToIntEnumListPolicyHandler( 556 new StringToIntEnumListPolicyHandler(
542 key::kExtensionAllowedTypes, 557 key::kExtensionAllowedTypes,
543 extensions::pref_names::kAllowedTypes, 558 extensions::pref_names::kAllowedTypes,
544 kExtensionAllowedTypesMap, 559 kExtensionAllowedTypesMap,
545 kExtensionAllowedTypesMap + arraysize(kExtensionAllowedTypesMap)))); 560 kExtensionAllowedTypesMap + arraysize(kExtensionAllowedTypesMap))));
546 #endif // !defined(OS_IOS) 561 #endif // !defined(OS_IOS)
547 562
548 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 563 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
549 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 564 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
550 new DiskCacheDirPolicyHandler())); 565 new DiskCacheDirPolicyHandler()));
551 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
552 new DownloadDirPolicyHandler));
553 566
554 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 567 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
555 new extensions::NativeMessagingHostListPolicyHandler( 568 new extensions::NativeMessagingHostListPolicyHandler(
556 key::kNativeMessagingWhitelist, 569 key::kNativeMessagingWhitelist,
557 extensions::pref_names::kNativeMessagingWhitelist, 570 extensions::pref_names::kNativeMessagingWhitelist,
558 false))); 571 false)));
559 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 572 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
560 new extensions::NativeMessagingHostListPolicyHandler( 573 new extensions::NativeMessagingHostListPolicyHandler(
561 key::kNativeMessagingBlacklist, 574 key::kNativeMessagingBlacklist,
562 extensions::pref_names::kNativeMessagingBlacklist, 575 extensions::pref_names::kNativeMessagingBlacklist,
563 true))); 576 true)));
564 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 577 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
565 578
579 #if !defined(OS_ANDROID) && !defined(OS_IOS)
580 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
581 new DownloadDirPolicyHandler));
582 #endif
583
566 #if defined(OS_CHROMEOS) 584 #if defined(OS_CHROMEOS)
567 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 585 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
568 new extensions::ExtensionListPolicyHandler( 586 new extensions::ExtensionListPolicyHandler(
569 key::kAttestationExtensionWhitelist, 587 key::kAttestationExtensionWhitelist,
570 prefs::kAttestationExtensionWhitelist, 588 prefs::kAttestationExtensionWhitelist,
571 false))); 589 false)));
572 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 590 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
573 NetworkConfigurationPolicyHandler::CreateForDevicePolicy())); 591 NetworkConfigurationPolicyHandler::CreateForDevicePolicy()));
574 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 592 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
575 NetworkConfigurationPolicyHandler::CreateForUserPolicy())); 593 NetworkConfigurationPolicyHandler::CreateForUserPolicy()));
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 #endif // defined(OS_CHROMEOS) 730 #endif // defined(OS_CHROMEOS)
713 731
714 #if defined(OS_ANDROID) || defined(OS_IOS) 732 #if defined(OS_ANDROID) || defined(OS_IOS)
715 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 733 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
716 new ManagedBookmarksPolicyHandler())); 734 new ManagedBookmarksPolicyHandler()));
717 #endif 735 #endif
718 return handlers.Pass(); 736 return handlers.Pass();
719 } 737 }
720 738
721 } // namespace policy 739 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/download/download_dir_policy_handler_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698