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

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

Issue 264913003: Changes shift key icon & highlight/caps UX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit. Created 6 years, 7 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 | « ui/keyboard/keyboard_resources.grd ('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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, 291 {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
292 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 292 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
293 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT}, 293 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
294 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE}, 294 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
295 {"keyboard/images/microphone-green.svg", 295 {"keyboard/images/microphone-green.svg",
296 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN}, 296 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
297 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE}, 297 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
298 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD}, 298 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
299 {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN}, 299 {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
300 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT}, 300 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
301 {"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH}, 301 {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH},
302 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, 302 {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT},
303 {"keyboard/images/shift-filled.svg", IDR_KEYBOARD_IMAGES_SHIFT_FILLED},
304 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN}, 303 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
305 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB}, 304 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
306 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP}, 305 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
307 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN}, 306 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
308 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP}, 307 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
309 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 308 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
310 {"keyboard/keyboard.js", IDR_KEYBOARD_JS}, 309 {"keyboard/keyboard.js", IDR_KEYBOARD_JS},
311 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC}, 310 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
312 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY}, 311 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
313 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY}, 312 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY},
(...skipping 25 matching lines...) Expand all
339 } 338 }
340 339
341 void LogKeyboardControlEvent(KeyboardControlEvent event) { 340 void LogKeyboardControlEvent(KeyboardControlEvent event) {
342 UMA_HISTOGRAM_ENUMERATION( 341 UMA_HISTOGRAM_ENUMERATION(
343 "VirtualKeyboard.KeyboardControlEvent", 342 "VirtualKeyboard.KeyboardControlEvent",
344 event, 343 event,
345 keyboard::KEYBOARD_CONTROL_MAX); 344 keyboard::KEYBOARD_CONTROL_MAX);
346 } 345 }
347 346
348 } // namespace keyboard 347 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | ui/keyboard/resources/elements/kb-key.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698