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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 328303008: athena: Use mojo to provide the bindings for the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | ui/keyboard/resources/index.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_util.cc
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 0be99e2f583651beb24ca3a395be55be45dd0ac8..438b99c22f683e799d9cf7a8a3652514d6999bab 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -315,51 +315,53 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
// necessary to have a custom path for the extension path, so the resource
// map cannot be used directly.
static const GritResourceMap kKeyboardResources[] = {
- {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
- {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
- {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
- {"keyboard/images/brightness-down.svg",
- IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
- {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
- {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW},
- {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
- {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
- {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
- {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
- {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
- {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
- {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
- {"keyboard/images/microphone-green.svg",
- IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
- {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
- {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
- {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
- {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
- {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH},
- {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT},
- {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
- {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
- {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
- {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
- {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
- {"keyboard/index.html", IDR_KEYBOARD_INDEX},
- {"keyboard/keyboard.js", IDR_KEYBOARD_JS},
- {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
- {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
- {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY},
- {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW},
- {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
- {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
- {"keyboard/polymer_loader.js", IDR_KEYBOARD_POLYMER_LOADER},
- {"keyboard/roboto_bold.ttf", IDR_KEYBOARD_ROBOTO_BOLD_TTF},
- {"keyboard/sounds/keypress-delete.wav",
- IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
- {"keyboard/sounds/keypress-return.wav",
- IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
- {"keyboard/sounds/keypress-spacebar.wav",
- IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
- {"keyboard/sounds/keypress-standard.wav",
- IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
+ {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
+ {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
+ {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
+ {"keyboard/images/brightness-down.svg",
+ IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
+ {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
+ {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW},
+ {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
+ {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
+ {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
+ {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
+ {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
+ {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
+ {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
+ {"keyboard/images/microphone-green.svg",
+ IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
+ {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
+ {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
+ {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
+ {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
+ {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH},
+ {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT},
+ {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
+ {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
+ {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
+ {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
+ {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
+ {"keyboard/index.html", IDR_KEYBOARD_INDEX},
+ {"keyboard/keyboard.js", IDR_KEYBOARD_JS},
+ {"keyboard/keyboard_mojo.js", IDR_KEYBOARD_MOJO_JS},
+ {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
+ {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
+ {"keyboard/layouts/system-qwerty.html",
+ IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY},
+ {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW},
+ {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
+ {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
+ {"keyboard/polymer_loader.js", IDR_KEYBOARD_POLYMER_LOADER},
+ {"keyboard/roboto_bold.ttf", IDR_KEYBOARD_ROBOTO_BOLD_TTF},
+ {"keyboard/sounds/keypress-delete.wav",
+ IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
+ {"keyboard/sounds/keypress-return.wav",
+ IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
+ {"keyboard/sounds/keypress-spacebar.wav",
+ IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
+ {"keyboard/sounds/keypress-standard.wav",
+ IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
};
static const size_t kKeyboardResourcesSize = arraysize(kKeyboardResources);
*size = kKeyboardResourcesSize;
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | ui/keyboard/resources/index.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698