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

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

Issue 59813004: Adds support for the search key in the Virtual Keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ui/keyboard/keyboard_ui_controller.cc ('k') | ui/keyboard/resources/elements/kb-key-codes.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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD}, 214 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
215 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN}, 215 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
216 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 216 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
217 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT}, 217 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
218 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE}, 218 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
219 {"keyboard/images/microphone-green.svg", 219 {"keyboard/images/microphone-green.svg",
220 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN}, 220 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
221 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE}, 221 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
222 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD}, 222 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
223 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT}, 223 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
224 {"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH},
224 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN}, 225 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
225 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP}, 226 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
226 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN}, 227 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
227 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP}, 228 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
228 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 229 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
229 {"keyboard/layouts/dvorak.html", IDR_KEYBOARD_LAYOUTS_DVORAK}, 230 {"keyboard/layouts/dvorak.html", IDR_KEYBOARD_LAYOUTS_DVORAK},
230 {"keyboard/layouts/latin-accents.js", IDR_KEYBOARD_LAYOUTS_LATIN_ACCENTS}, 231 {"keyboard/layouts/latin-accents.js", IDR_KEYBOARD_LAYOUTS_LATIN_ACCENTS},
231 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC}, 232 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
232 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY}, 233 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
233 {"keyboard/layouts/symbol-altkeys.js", 234 {"keyboard/layouts/symbol-altkeys.js",
(...skipping 12 matching lines...) Expand all
246 } 247 }
247 248
248 void LogKeyboardControlEvent(KeyboardControlEvent event) { 249 void LogKeyboardControlEvent(KeyboardControlEvent event) {
249 UMA_HISTOGRAM_ENUMERATION( 250 UMA_HISTOGRAM_ENUMERATION(
250 "VirtualKeyboard.KeyboardControlEvent", 251 "VirtualKeyboard.KeyboardControlEvent",
251 event, 252 event,
252 keyboard::KEYBOARD_CONTROL_MAX); 253 keyboard::KEYBOARD_CONTROL_MAX);
253 } 254 }
254 255
255 } // namespace keyboard 256 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard_ui_controller.cc ('k') | ui/keyboard/resources/elements/kb-key-codes.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698