Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc |
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
index cbf8a45f8f6b80b8cbfbac097435dae537256844..6249a2ce02d9590da533676b1b2d9a741b9affe9 100644 |
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
@@ -9,6 +9,7 @@ |
#include "base/memory/scoped_vector.h" |
#include "base/values.h" |
#include "chrome/browser/net/proxy_policy_handler.h" |
+#include "chrome/browser/policy/managed_bookmarks_policy_handler.h" |
#include "chrome/browser/profiles/incognito_mode_policy_handler.h" |
#include "chrome/browser/search_engines/default_search_policy_handler.h" |
#include "chrome/common/pref_names.h" |
@@ -46,10 +47,6 @@ |
#include "chromeos/dbus/power_policy_controller.h" |
#endif |
-#if defined(OS_ANDROID) || defined(OS_IOS) |
-#include "chrome/browser/policy/managed_bookmarks_policy_handler.h" |
-#endif |
- |
#if !defined(OS_ANDROID) && !defined(OS_IOS) |
#include "chrome/browser/download/download_dir_policy_handler.h" |
#endif |
@@ -525,6 +522,8 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList( |
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
new IncognitoModePolicyHandler())); |
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
+ new ManagedBookmarksPolicyHandler(chrome_schema))); |
+ handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
new ProxyPolicyHandler())); |
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
new URLBlacklistPolicyHandler())); |
@@ -732,10 +731,6 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList( |
new ExternalDataPolicyHandler(key::kWallpaperImage))); |
#endif // defined(OS_CHROMEOS) |
-#if defined(OS_ANDROID) || defined(OS_IOS) |
- handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
- new ManagedBookmarksPolicyHandler())); |
-#endif |
return handlers.Pass(); |
} |