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

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index b75d42e9515949a5e8d9c898f18eb43c028f012c..c95ddba71b002c5e2f785f36c49d228afe266f88 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

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

#include <vector>

#include "ash/autoclick/autoclick_controller.h"

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

#include "ash/shell.h"

#include "base/command_line.h"

#include "base/i18n/time_formatting.h"

@@ -40,6 +39,7 @@

#include "components/pref_registry/pref_registry_syncable.h"

#include "components/user_manager/user.h"

#include "third_party/icu/source/i18n/unicode/timezone.h"

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

#include "ui/events/event_constants.h"

#include "ui/events/event_utils.h"

#include "url/gurl.h"

@@ -159,7 +159,7 @@ void Preferences::RegisterProfilePrefs(

user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

registry->RegisterIntegerPref(

prefs::kAccessibilityScreenMagnifierType,

- ash::kDefaultMagnifierType,

+ ui::kDefaultMagnifierType,

user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

registry->RegisterDoublePref(

prefs::kAccessibilityScreenMagnifierScale,