chrome/browser/ui/ash/ash_init.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/ui/ash/ash_init.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/resources/chromeos/chromevox/testing/chromevox_e2e_test_base.js ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 2722dd8a8104d1492387cf3a0e95418d58db3320..1027d95ab53eea0a6f2e0f616370aca796a3d5df 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -77,12 +77,12 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {

DCHECK(chromeos::MagnificationManager::Get());

bool magnifier_enabled =

chromeos::MagnificationManager::Get()->IsMagnifierEnabled();

- ash::MagnifierType magnifier_type =

+ ui::MagnifierType magnifier_type =

chromeos::MagnificationManager::Get()->GetMagnifierType();

shell->magnification_controller()->

- SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);

+ SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_FULL);

shell->partial_magnification_controller()->

- SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);

+ SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_PARTIAL);

if (!CommandLine::ForCurrentProcess()->HasSwitch(

switches::kDisableZeroBrowsersOpenForTests)) {