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

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

Issue 1150373002: platformKeys: Add policy and corporate key tagging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@key_perm
Patch Set: Rebased. Created 5 years, 6 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/prefs/pref_value_map.h" 10 #include "base/prefs/pref_value_map.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" 36 #include "chrome/browser/net/disk_cache_dir_policy_handler.h"
37 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" 37 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
38 #include "chrome/browser/policy/javascript_policy_handler.h" 38 #include "chrome/browser/policy/javascript_policy_handler.h"
39 #include "chrome/browser/policy/network_prediction_policy_handler.h" 39 #include "chrome/browser/policy/network_prediction_policy_handler.h"
40 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 40 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
41 #include "chrome/browser/sync/sync_policy_handler.h" 41 #include "chrome/browser/sync/sync_policy_handler.h"
42 #endif 42 #endif
43 43
44 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
45 #include "chrome/browser/chromeos/drive/drive_pref_names.h" 45 #include "chrome/browser/chromeos/drive/drive_pref_names.h"
46 #include "chrome/browser/chromeos/platform_keys/key_permissions_policy_handler.h "
46 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 47 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
47 #include "chromeos/chromeos_pref_names.h" 48 #include "chromeos/chromeos_pref_names.h"
48 #include "chromeos/dbus/power_policy_controller.h" 49 #include "chromeos/dbus/power_policy_controller.h"
49 #include "components/user_manager/user.h" 50 #include "components/user_manager/user.h"
50 #include "components/user_manager/user_manager.h" 51 #include "components/user_manager/user_manager.h"
51 #include "ui/chromeos/accessibility_types.h" 52 #include "ui/chromeos/accessibility_types.h"
52 #endif 53 #endif
53 54
54 #if !defined(OS_ANDROID) && !defined(OS_IOS) 55 #if !defined(OS_ANDROID) && !defined(OS_IOS)
55 #include "chrome/browser/download/download_dir_policy_handler.h" 56 #include "chrome/browser/download/download_dir_policy_handler.h"
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 screen_lock_legacy_policies.Pass(), 770 screen_lock_legacy_policies.Pass(),
770 make_scoped_ptr(new ScreenLockDelayPolicyHandler(chrome_schema))))); 771 make_scoped_ptr(new ScreenLockDelayPolicyHandler(chrome_schema)))));
771 handlers->AddHandler( 772 handlers->AddHandler(
772 make_scoped_ptr(new ExternalDataPolicyHandler(key::kUserAvatarImage))); 773 make_scoped_ptr(new ExternalDataPolicyHandler(key::kUserAvatarImage)));
773 handlers->AddHandler( 774 handlers->AddHandler(
774 make_scoped_ptr(new ExternalDataPolicyHandler(key::kWallpaperImage))); 775 make_scoped_ptr(new ExternalDataPolicyHandler(key::kWallpaperImage)));
775 handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler( 776 handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler(
776 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT, 777 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT,
777 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 778 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
778 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 779 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
780 handlers->AddHandler(make_scoped_ptr(
781 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
779 #endif // defined(OS_CHROMEOS) 782 #endif // defined(OS_CHROMEOS)
780 783
781 return handlers.Pass(); 784 return handlers.Pass();
782 } 785 }
783 786
784 } // namespace policy 787 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698