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

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

Issue 1257313003: Update Google Input Tools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Free up grd resources. Created 5 years, 4 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
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | no next file » | 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/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 logged = true; 366 logged = true;
367 } 367 }
368 } 368 }
369 369
370 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { 370 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
371 // This looks a lot like the contents of a resource map; however it is 371 // This looks a lot like the contents of a resource map; however it is
372 // necessary to have a custom path for the extension path, so the resource 372 // necessary to have a custom path for the extension path, so the resource
373 // map cannot be used directly. 373 // map cannot be used directly.
374 static const GritResourceMap kKeyboardResources[] = { 374 static const GritResourceMap kKeyboardResources[] = {
375 {"keyboard/locales/en.js", IDR_KEYBOARD_LOCALES_EN}, 375 {"keyboard/locales/en.js", IDR_KEYBOARD_LOCALES_EN},
376 {"keyboard/config/m-emoji.js", IDR_KEYBOARD_CONFIG_EMOJI}, 376 {"keyboard/config/emoji.js", IDR_KEYBOARD_CONFIG_EMOJI},
377 {"keyboard/config/m-hwt.js", IDR_KEYBOARD_CONFIG_HWT}, 377 {"keyboard/config/hwt.js", IDR_KEYBOARD_CONFIG_HWT},
378 {"keyboard/config/us.js", IDR_KEYBOARD_CONFIG_US}, 378 {"keyboard/config/us.js", IDR_KEYBOARD_CONFIG_US},
379 {"keyboard/emoji.css", IDR_KEYBOARD_CSS_EMOJI}, 379 {"keyboard/emoji.css", IDR_KEYBOARD_CSS_EMOJI},
380 {"keyboard/images/3dots.png", IDR_KEYBOARD_IMAGES_3_DOTS},
381 {"keyboard/images/back_to_keyboard.png",
382 IDR_KEYBOARD_IMAGES_BACK_TO_KEYBOARD},
380 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE}, 383 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
381 {"keyboard/images/car.png", IDR_KEYBOARD_IMAGES_CAR}, 384 {"keyboard/images/car.png", IDR_KEYBOARD_IMAGES_CAR},
382 {"keyboard/images/check.png", IDR_KEYBOARD_IMAGES_CHECK}, 385 {"keyboard/images/check.png", IDR_KEYBOARD_IMAGES_CHECK},
386 {"keyboard/images/check_in_menu.png", IDR_KEYBOARD_IMAGES_CHECK_IN_MENU},
383 {"keyboard/images/compact.png", IDR_KEYBOARD_IMAGES_COMPACT}, 387 {"keyboard/images/compact.png", IDR_KEYBOARD_IMAGES_COMPACT},
384 {"keyboard/images/down.png", IDR_KEYBOARD_IMAGES_DOWN}, 388 {"keyboard/images/down.png", IDR_KEYBOARD_IMAGES_DOWN},
385 {"keyboard/images/emoji.png", IDR_KEYBOARD_IMAGES_EMOJI}, 389 {"keyboard/images/emoji.png", IDR_KEYBOARD_IMAGES_EMOJI},
390 {"keyboard/images/emoji_car.png", IDR_KEYBOARD_IMAGES_EMOJI_CAR},
391 {"keyboard/images/emoji_crown.png", IDR_KEYBOARD_IMAGES_EMOJI_CROWN},
392 {"keyboard/images/emoji_emoticon.png",
393 IDR_KEYBOARD_IMAGES_EMOJI_EMOTICON},
394 {"keyboard/images/emoji_flower.png", IDR_KEYBOARD_IMAGES_EMOJI_FLOWER},
395 {"keyboard/images/emoji_hot.png", IDR_KEYBOARD_IMAGES_EMOJI_HOT},
396 {"keyboard/images/emoji_recent.png", IDR_KEYBOARD_IMAGES_EMOJI_RECENT},
397 {"keyboard/images/emoji_shape.png", IDR_KEYBOARD_IMAGES_EMOJI_SHAPE},
386 {"keyboard/images/emoji_cat_items.png", IDR_KEYBOARD_IMAGES_CAT}, 398 {"keyboard/images/emoji_cat_items.png", IDR_KEYBOARD_IMAGES_CAT},
387 {"keyboard/images/emoticon.png", IDR_KEYBOARD_IMAGES_EMOTICON}, 399 {"keyboard/images/emoticon.png", IDR_KEYBOARD_IMAGES_EMOTICON},
388 {"keyboard/images/enter.png", IDR_KEYBOARD_IMAGES_RETURN}, 400 {"keyboard/images/enter.png", IDR_KEYBOARD_IMAGES_RETURN},
389 {"keyboard/images/error.png", IDR_KEYBOARD_IMAGES_ERROR}, 401 {"keyboard/images/error.png", IDR_KEYBOARD_IMAGES_ERROR},
390 {"keyboard/images/favorit.png", IDR_KEYBOARD_IMAGES_FAVORITE}, 402 {"keyboard/images/favorit.png", IDR_KEYBOARD_IMAGES_FAVORITE},
391 {"keyboard/images/flower.png", IDR_KEYBOARD_IMAGES_FLOWER}, 403 {"keyboard/images/flower.png", IDR_KEYBOARD_IMAGES_FLOWER},
392 {"keyboard/images/globe.png", IDR_KEYBOARD_IMAGES_GLOBE}, 404 {"keyboard/images/globe.png", IDR_KEYBOARD_IMAGES_GLOBE},
393 {"keyboard/images/hide.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, 405 {"keyboard/images/hide.png", IDR_KEYBOARD_IMAGES_HIDE},
406 {"keyboard/images/hidekeyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
394 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 407 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
395 {"keyboard/images/left.png", IDR_KEYBOARD_IMAGES_LEFT}, 408 {"keyboard/images/left.png", IDR_KEYBOARD_IMAGES_LEFT},
396 {"keyboard/images/penci.png", IDR_KEYBOARD_IMAGES_PENCIL}, 409 {"keyboard/images/penci.png", IDR_KEYBOARD_IMAGES_PENCIL},
397 {"keyboard/images/recent.png", IDR_KEYBOARD_IMAGES_RECENT}, 410 {"keyboard/images/recent.png", IDR_KEYBOARD_IMAGES_RECENT},
398 {"keyboard/images/regular_size.png", IDR_KEYBOARD_IMAGES_FULLSIZE}, 411 {"keyboard/images/regular_size.png", IDR_KEYBOARD_IMAGES_FULLSIZE},
399 {"keyboard/images/menu.png", IDR_KEYBOARD_IMAGES_MENU}, 412 {"keyboard/images/menu.png", IDR_KEYBOARD_IMAGES_MENU},
400 {"keyboard/images/pencil.png", IDR_KEYBOARD_IMAGES_PENCIL}, 413 {"keyboard/images/pencil.png", IDR_KEYBOARD_IMAGES_PENCIL},
401 {"keyboard/images/right.png", IDR_KEYBOARD_IMAGES_RIGHT}, 414 {"keyboard/images/right.png", IDR_KEYBOARD_IMAGES_RIGHT},
402 {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH}, 415 {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH},
416 {"keyboard/images/select_right.png", IDR_KEYBOARD_IMAGES_SELECT_RIGHT},
417 {"keyboard/images/select_left.png", IDR_KEYBOARD_IMAGES_SELECT_LEFT},
403 {"keyboard/images/setting.png", IDR_KEYBOARD_IMAGES_SETTINGS}, 418 {"keyboard/images/setting.png", IDR_KEYBOARD_IMAGES_SETTINGS},
404 {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT}, 419 {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT},
405 {"keyboard/images/space.png", IDR_KEYBOARD_IMAGES_SPACE}, 420 {"keyboard/images/space.png", IDR_KEYBOARD_IMAGES_SPACE},
406 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB}, 421 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
422 {"keyboard/images/tab_in_fullsize.png",
423 IDR_KEYBOARD_IMAGES_TAB_IN_FULLSIZE},
407 {"keyboard/images/triangle.png", IDR_KEYBOARD_IMAGES_TRIANGLE}, 424 {"keyboard/images/triangle.png", IDR_KEYBOARD_IMAGES_TRIANGLE},
408 {"keyboard/images/up.png", IDR_KEYBOARD_IMAGES_UP}, 425 {"keyboard/images/up.png", IDR_KEYBOARD_IMAGES_UP},
409 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 426 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
410 {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER}, 427 {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER},
411 {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS}, 428 {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS},
412 {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS}, 429 {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS},
413 {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101}, 430 {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101},
414 {"keyboard/inputview_layouts/compactkbd-qwerty.js", 431 {"keyboard/inputview_layouts/compactkbd-qwerty.js",
415 IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY}, 432 IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY},
416 {"keyboard/inputview_layouts/compactkbd-numberpad.js", 433 {"keyboard/inputview_layouts/compactkbd-numberpad.js",
417 IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD}, 434 IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD},
418 {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI}, 435 {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI},
419 {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT}, 436 {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT},
420 {"keyboard/inputview_layouts/m-101kbd.js",
421 IDR_KEYBOARD_LAYOUTS_MATERIAL_101},
422 {"keyboard/inputview_layouts/m-compactkbd-qwerty.js",
423 IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_QWERTY},
424 {"keyboard/inputview_layouts/m-compactkbd-numberpad.js",
425 IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_NUMBERPAD},
426 {"keyboard/inputview_layouts/m-emoji.js",
427 IDR_KEYBOARD_LAYOUTS_MATERIAL_EMOJI},
428 {"keyboard/inputview_layouts/m-handwriting.js",
429 IDR_KEYBOARD_LAYOUTS_MATERIAL_HWT},
430 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, 437 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
431 {"keyboard/sounds/keypress-delete.wav", 438 {"keyboard/sounds/keypress-delete.wav",
432 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE}, 439 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
433 {"keyboard/sounds/keypress-return.wav", 440 {"keyboard/sounds/keypress-return.wav",
434 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN}, 441 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
435 {"keyboard/sounds/keypress-spacebar.wav", 442 {"keyboard/sounds/keypress-spacebar.wav",
436 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR}, 443 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
437 {"keyboard/sounds/keypress-standard.wav", 444 {"keyboard/sounds/keypress-standard.wav",
438 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD}, 445 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
439 }; 446 };
(...skipping 11 matching lines...) Expand all
451 } 458 }
452 459
453 void LogKeyboardControlEvent(KeyboardControlEvent event) { 460 void LogKeyboardControlEvent(KeyboardControlEvent event) {
454 UMA_HISTOGRAM_ENUMERATION( 461 UMA_HISTOGRAM_ENUMERATION(
455 "VirtualKeyboard.KeyboardControlEvent", 462 "VirtualKeyboard.KeyboardControlEvent",
456 event, 463 event,
457 keyboard::KEYBOARD_CONTROL_MAX); 464 keyboard::KEYBOARD_CONTROL_MAX);
458 } 465 }
459 466
460 } // namespace keyboard 467 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698