Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: ui/keyboard/keyboard_util.cc

Issue 43593003: Add layout switcher for virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix keyboard tests. Created 7 years, 1 month 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 | « ui/keyboard/keyboard_ui_controller.cc ('k') | ui/keyboard/resources/elements/kb-key.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/keyboard/keyboard_util.h" 5 #include "ui/keyboard/keyboard_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 {"keyboard/elements/kb-key-base.html", IDR_KEYBOARD_ELEMENTS_KEY_BASE}, 193 {"keyboard/elements/kb-key-base.html", IDR_KEYBOARD_ELEMENTS_KEY_BASE},
194 {"keyboard/elements/kb-key-codes.html", IDR_KEYBOARD_ELEMENTS_KEY_CODES}, 194 {"keyboard/elements/kb-key-codes.html", IDR_KEYBOARD_ELEMENTS_KEY_CODES},
195 {"keyboard/elements/kb-key-import.html", 195 {"keyboard/elements/kb-key-import.html",
196 IDR_KEYBOARD_ELEMENTS_KEY_IMPORT}, 196 IDR_KEYBOARD_ELEMENTS_KEY_IMPORT},
197 {"keyboard/elements/kb-key-sequence.html", 197 {"keyboard/elements/kb-key-sequence.html",
198 IDR_KEYBOARD_ELEMENTS_KEY_SEQUENCE}, 198 IDR_KEYBOARD_ELEMENTS_KEY_SEQUENCE},
199 {"keyboard/elements/kb-keyboard.html", IDR_KEYBOARD_ELEMENTS_KEYBOARD}, 199 {"keyboard/elements/kb-keyboard.html", IDR_KEYBOARD_ELEMENTS_KEYBOARD},
200 {"keyboard/elements/kb-keyset.html", IDR_KEYBOARD_ELEMENTS_KEYSET}, 200 {"keyboard/elements/kb-keyset.html", IDR_KEYBOARD_ELEMENTS_KEYSET},
201 {"keyboard/elements/kb-modifier-key.html", 201 {"keyboard/elements/kb-modifier-key.html",
202 IDR_KEYBOARD_ELEMENTS_MODIFIER_KEY}, 202 IDR_KEYBOARD_ELEMENTS_MODIFIER_KEY},
203 {"keyboard/elements/kb-options-menu.html",
204 IDR_KEYBOARD_ELEMENTS_OPTIONS_MENU},
203 {"keyboard/elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW}, 205 {"keyboard/elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW},
204 {"keyboard/elements/kb-shift-key.html", IDR_KEYBOARD_ELEMENTS_SHIFT_KEY}, 206 {"keyboard/elements/kb-shift-key.html", IDR_KEYBOARD_ELEMENTS_SHIFT_KEY},
205 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW}, 207 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
206 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK}, 208 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
207 {"keyboard/images/brightness-down.svg", 209 {"keyboard/images/brightness-down.svg",
208 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN}, 210 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
209 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP}, 211 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
210 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW}, 212 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW},
211 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN}, 213 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
212 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD}, 214 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 246 }
245 247
246 void LogKeyboardControlEvent(KeyboardControlEvent event) { 248 void LogKeyboardControlEvent(KeyboardControlEvent event) {
247 UMA_HISTOGRAM_ENUMERATION( 249 UMA_HISTOGRAM_ENUMERATION(
248 "VirtualKeyboard.KeyboardControlEvent", 250 "VirtualKeyboard.KeyboardControlEvent",
249 event, 251 event,
250 keyboard::KEYBOARD_CONTROL_MAX); 252 keyboard::KEYBOARD_CONTROL_MAX);
251 } 253 }
252 254
253 } // namespace keyboard 255 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard_ui_controller.cc ('k') | ui/keyboard/resources/elements/kb-key.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698