chrome/browser/ui/webui/options/browser_options_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/options/browser_options_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

« chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc ('K') | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | ui/chromeos/accessibility_types.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index d1fc5400d58dd08099bef7372428eb7db70d7783..1067152be2131f2f51500862435d980d89ae88d4 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

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

#if defined(OS_CHROMEOS)

#include "ash/ash_switches.h"

#include "ash/desktop_background/user_wallpaper_delegate.h"

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

#include "ash/shell.h"

#include "chrome/browser/browser_process_platform_part.h"

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

@@ -121,6 +120,7 @@

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

#include "policy/policy_constants.h"

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

#include "ui/gfx/image/image_skia.h"

#endif // defined(OS_CHROMEOS)

@@ -568,13 +568,13 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {

scoped_ptr<base::ListValue> magnifier_list(new base::ListValue);

scoped_ptr<base::ListValue> option_full(new base::ListValue);

- option_full->AppendInteger(ash::MAGNIFIER_FULL);

+ option_full->AppendInteger(ui::MAGNIFIER_FULL);

option_full->AppendString(l10n_util::GetStringUTF16(

IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));

magnifier_list->Append(option_full.release());

scoped_ptr<base::ListValue> option_partial(new base::ListValue);

- option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);

+ option_partial->AppendInteger(ui::MAGNIFIER_PARTIAL);

option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(

IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));

magnifier_list->Append(option_partial.release());