chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc - Issue 232333002: ozone: Rename XKeyboard to KeyboardController & use fake under ozone

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

Issue 232333002: ozone: Rename XKeyboard to KeyboardController & use fake under ozone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rename to ImeKeyboard & rebase Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chromeos/chromeos_switches.h"	9 #include "chromeos/chromeos_switches.h"

10 #include "chromeos/ime/xkeyboard.h"	10 #include "chromeos/ime/ime_keyboard.h"

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

12 #include "grit/generated_resources.h"	12 #include "grit/generated_resources.h"

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

14	14

15 namespace {	15 namespace {

16 const struct ModifierKeysSelectItem {	16 const struct ModifierKeysSelectItem {

17 int message_id;	17 int message_id;

18 chromeos::input_method::ModifierKey value;	18 chromeos::input_method::ModifierKey value;

19 } kModifierKeysSelectItems[] = {	19 } kModifierKeysSelectItems[] = {

20 { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH,	20 { IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH,

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
114 web_ui()->CallJavascriptFunction(	114 web_ui()->CallJavascriptFunction(

115 "options.KeyboardOverlay.showCapsLockOptions",	115 "options.KeyboardOverlay.showCapsLockOptions",

116 show_caps_lock_options);	116 show_caps_lock_options);

117 web_ui()->CallJavascriptFunction(	117 web_ui()->CallJavascriptFunction(

118 "options.KeyboardOverlay.showDiamondKeyOptions",	118 "options.KeyboardOverlay.showDiamondKeyOptions",

119 show_diamond_key_options);	119 show_diamond_key_options);

120 }	120 }

121	121

122 } // namespace options	122 } // namespace options

123 } // namespace chromeos	123 } // namespace chromeos

OLD	NEW