chrome/browser/policy/configuration_policy_handler_list_factory.cc - Issue 199233002: Moved the ManagedBookmarksPolicyHandler to a shared file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

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 4fa4e09c2237b9ed7709d2403d57962043c231d2..6989a71d0ea2217a39a8dcebaa2d1ecb18492405 100644

--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc

+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -41,11 +41,11 @@

#include "ash/magnifier/magnifier_constants.h"

#include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"

#include "chromeos/dbus/power_policy_controller.h"

-#endif // defined(OS_CHROMEOS)

+#endif

-#if defined(OS_ANDROID)

-#include "chrome/browser/policy/configuration_policy_handler_android.h"

-#endif // defined(OS_ANDROID)

+#if defined(OS_ANDROID) || defined(OS_IOS)

+#include "chrome/browser/policy/managed_bookmarks_policy_handler.h"

+#endif

#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)

#include "chrome/browser/download/download_dir_policy_handler.h"

@@ -712,7 +712,7 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(

new ExternalDataPolicyHandler(key::kUserAvatarImage)));

#endif // defined(OS_CHROMEOS)

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) || defined(OS_IOS)

handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(

new ManagedBookmarksPolicyHandler()));

#endif