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

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

Issue 199233002: Moved the ManagedBookmarksPolicyHandler to a shared file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
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 23 matching lines...) Expand all
34 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 34 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
35 #include "chrome/browser/sync/sync_policy_handler.h" 35 #include "chrome/browser/sync/sync_policy_handler.h"
36 #include "extensions/browser/pref_names.h" 36 #include "extensions/browser/pref_names.h"
37 #include "extensions/common/manifest.h" 37 #include "extensions/common/manifest.h"
38 #endif 38 #endif
39 39
40 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
41 #include "ash/magnifier/magnifier_constants.h" 41 #include "ash/magnifier/magnifier_constants.h"
42 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 42 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
43 #include "chromeos/dbus/power_policy_controller.h" 43 #include "chromeos/dbus/power_policy_controller.h"
44 #endif // defined(OS_CHROMEOS) 44 #endif
45 45
46 #if defined(OS_ANDROID) 46 #if defined(OS_ANDROID) || defined(OS_IOS)
47 #include "chrome/browser/policy/configuration_policy_handler_android.h" 47 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h"
48 #endif // defined(OS_ANDROID) 48 #endif
49 49
50 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 50 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
51 #include "chrome/browser/download/download_dir_policy_handler.h" 51 #include "chrome/browser/download/download_dir_policy_handler.h"
52 #endif 52 #endif
53 53
54 #if !defined(OS_MACOSX) && !defined(OS_IOS) 54 #if !defined(OS_MACOSX) && !defined(OS_IOS)
55 #include "apps/pref_names.h" 55 #include "apps/pref_names.h"
56 #endif 56 #endif
57 57
58 namespace policy { 58 namespace policy {
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 new PowerManagementIdleSettingsPolicyHandler(chrome_schema))))); 705 new PowerManagementIdleSettingsPolicyHandler(chrome_schema)))));
706 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 706 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
707 new LegacyPoliciesDeprecatingPolicyHandler( 707 new LegacyPoliciesDeprecatingPolicyHandler(
708 screen_lock_legacy_policies.Pass(), 708 screen_lock_legacy_policies.Pass(),
709 make_scoped_ptr<SchemaValidatingPolicyHandler>( 709 make_scoped_ptr<SchemaValidatingPolicyHandler>(
710 new ScreenLockDelayPolicyHandler(chrome_schema))))); 710 new ScreenLockDelayPolicyHandler(chrome_schema)))));
711 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 711 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
712 new ExternalDataPolicyHandler(key::kUserAvatarImage))); 712 new ExternalDataPolicyHandler(key::kUserAvatarImage)));
713 #endif // defined(OS_CHROMEOS) 713 #endif // defined(OS_CHROMEOS)
714 714
715 #if defined(OS_ANDROID) 715 #if defined(OS_ANDROID) || defined(OS_IOS)
716 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 716 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
717 new ManagedBookmarksPolicyHandler())); 717 new ManagedBookmarksPolicyHandler()));
718 #endif 718 #endif
719 return handlers.Pass(); 719 return handlers.Pass();
720 } 720 }
721 721
722 } // namespace policy 722 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698