chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.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/chromeos/policy/configuration_policy_handler_chromeos.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/login/wizard_controller_browsertest.cc ('k') | chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

index ba4a42def4ea42a0abc03187ab837627baf5c28a..cc287acaeefdd172e273d2f1a8ee6617ce53e261 100644

--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

@@ -7,7 +7,6 @@

#include <string>

#include <vector>

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

#include "base/callback.h"

#include "base/json/json_reader.h"

#include "base/json/json_writer.h"

@@ -31,6 +30,7 @@

#include "crypto/sha2.h"

#include "grit/components_strings.h"

#include "policy/policy_constants.h"

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

#include "url/gurl.h"

namespace policy {

@@ -334,7 +334,7 @@ void PinnedLauncherAppsPolicyHandler::ApplyPolicySettings(

ScreenMagnifierPolicyHandler::ScreenMagnifierPolicyHandler()

: IntRangePolicyHandlerBase(key::kScreenMagnifierType,

- 0, ash::MAGNIFIER_FULL, false) {

+ 0, ui::MAGNIFIER_FULL, false) {

}

ScreenMagnifierPolicyHandler::~ScreenMagnifierPolicyHandler() {