chrome/browser/ui/webui/chromeos/login/core_oobe_handler.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/webui/chromeos/login/core_oobe_handler.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/ui/ash/volume_controller_browsertest_chromeos.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

index dc5c4d83197aaf52339dfa8d67a48c91ebb1cca4..116e9ccee15e2c3bcda97a576c512da2f13dba70 100644

--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -4,13 +4,11 @@

#include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"

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

#include "ash/shell.h"

#include "base/memory/scoped_ptr.h"

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

-#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

#include "chrome/browser/chromeos/login/helper.h"

#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

@@ -26,11 +24,16 @@

#include "chrome/grit/generated_resources.h"

#include "chromeos/chromeos_constants.h"

#include "grit/components_strings.h"

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

#include "ui/gfx/display.h"

#include "ui/gfx/screen.h"

#include "ui/gfx/size.h"

#include "ui/keyboard/keyboard_controller.h"

+#if !defined(USE_ATHENA)

+#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

+#endif

namespace {

const char kJsScreenPath[] = "cr.ui.Oobe";

@@ -272,7 +275,7 @@ void CoreOobeHandler::HandleEnableSpokenFeedback(bool /* enabled */) {

// Checkbox is initialized on page init and updates when spoken feedback

// setting is changed so just toggle spoken feedback here.

AccessibilityManager::Get()->ToggleSpokenFeedback(

- ash::A11Y_NOTIFICATION_NONE);

+ ui::A11Y_NOTIFICATION_NONE);

}

void CoreOobeHandler::HandleSetDeviceRequisition(