chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc - Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena

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/chromeos/keyboard_handler.cc

Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash43_kiosk_mode

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

Index: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

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

index ac46347714db012cde7df2717749c1f4bf8a857a..8af6dae9f4a31e60e55481cf954acab51a5b9123 100644

--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

@@ -4,8 +4,6 @@

#include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h"

-#include "ash/new_window_delegate.h"

-#include "ash/shell.h"

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/command_line.h"

@@ -16,6 +14,11 @@

#include "content/public/browser/web_ui.h"

#include "ui/base/l10n/l10n_util.h"

+#if !defined(USE_ATHENA)

+#include "ash/new_window_delegate.h"

+#include "ash/shell.h"

+#endif

namespace {

const struct ModifierKeysSelectItem {

int message_id;

@@ -156,7 +159,7 @@ void KeyboardHandler::RegisterMessages() {

}

void KeyboardHandler::HandleShowKeyboardShortcuts(const base::ListValue* args) {

-#if defined(USE_ATHENA)

+#if !defined(USE_ATHENA)

// Athena doesn't have ash::Shell and its new_window_delegate so keyboard

// shortcut overlays are not supported.

// TODO(mukai): re-enable this.