ash/default_accessibility_delegate.h - 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: ash/default_accessibility_delegate.h

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 | « ash/ash_touch_exploration_manager_chromeos.cc ('k') | ash/default_accessibility_delegate.cc » ('j') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/default_accessibility_delegate.h

diff --git a/ash/default_accessibility_delegate.h b/ash/default_accessibility_delegate.h

index 86115dcd0646425c8a8a0d3344d38f509df993b2..d0a39698d3630a0084dbe3cafa35bb2697112736 100644

--- a/ash/default_accessibility_delegate.h

+++ b/ash/default_accessibility_delegate.h

@@ -21,9 +21,9 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {

virtual void ToggleHighContrast() override;

virtual bool IsHighContrastEnabled() const override;

virtual void SetMagnifierEnabled(bool enabled) override;

- virtual void SetMagnifierType(MagnifierType type) override;

+ virtual void SetMagnifierType(ui::MagnifierType type) override;

virtual bool IsMagnifierEnabled() const override;

- virtual MagnifierType GetMagnifierType() const override;

+ virtual ui::MagnifierType GetMagnifierType() const override;

virtual void SetLargeCursorEnabled(bool enabled) override;

virtual bool IsLargeCursorEnabled() const override;

virtual void SetAutoclickEnabled(bool enabled) override;

@@ -34,11 +34,11 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {

virtual bool IsBrailleDisplayConnected() const override;

virtual void SilenceSpokenFeedback() const override;

virtual void ToggleSpokenFeedback(

- AccessibilityNotificationVisibility notify) override;

+ ui::AccessibilityNotificationVisibility notify) override;

virtual void SaveScreenMagnifierScale(double scale) override;

virtual double GetSavedScreenMagnifierScale() override;

- virtual void TriggerAccessibilityAlert(AccessibilityAlert alert) override;

- virtual AccessibilityAlert GetLastAccessibilityAlert() override;

+ virtual void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override;

+ virtual ui::AccessibilityAlert GetLastAccessibilityAlert() override;

virtual void PlayEarcon(int sound_key) override;

virtual base::TimeDelta PlayShutdownSound() const override;

@@ -46,11 +46,11 @@ class ASH_EXPORT DefaultAccessibilityDelegate : public AccessibilityDelegate {

bool spoken_feedback_enabled_;

bool high_contrast_enabled_;

bool screen_magnifier_enabled_;

- MagnifierType screen_magnifier_type_;

+ ui::MagnifierType screen_magnifier_type_;

bool large_cursor_enabled_;

bool autoclick_enabled_;

bool virtual_keyboard_enabled_;

- AccessibilityAlert accessibility_alert_;

+ ui::AccessibilityAlert accessibility_alert_;

DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityDelegate);

};