chrome/browser/policy/configuration_policy_handler_list_factory.cc - Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0

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 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect

Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/system/tray_accessibility_browsertest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 633dbea78840e6781f4059decb35cf716e15e4ab..6bb665332a0176164b7406dd5e447362f9ab4163 100644

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

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

@@ -37,11 +37,11 @@

#endif

#if defined(OS_CHROMEOS)

-#include "ash/magnifier/magnifier_constants.h"

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

#include "chromeos/dbus/power_policy_controller.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

+#include "ui/chromeos/accessibility_types.h"

#endif

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

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

key::kDeviceLoginScreenDefaultScreenMagnifierType,

NULL,

- ash::MAGNIFIER_FULL,

+ ui::MAGNIFIER_FULL,

false)));

// TODO(binjin): Remove LegacyPoliciesDeprecatingPolicyHandler for these two

// policies once deprecation of legacy power management policies is done.

« no previous file with comments | « chrome/browser/chromeos/system/tray_accessibility_browsertest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »