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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | ui/keyboard/resources/index.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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 base::Time::Now() - g_keyboard_load_time_start.Get()); 308 base::Time::Now() - g_keyboard_load_time_start.Get());
309 logged = true; 309 logged = true;
310 } 310 }
311 } 311 }
312 312
313 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { 313 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
314 // This looks a lot like the contents of a resource map; however it is 314 // This looks a lot like the contents of a resource map; however it is
315 // necessary to have a custom path for the extension path, so the resource 315 // necessary to have a custom path for the extension path, so the resource
316 // map cannot be used directly. 316 // map cannot be used directly.
317 static const GritResourceMap kKeyboardResources[] = { 317 static const GritResourceMap kKeyboardResources[] = {
318 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW}, 318 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
319 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK}, 319 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
320 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE}, 320 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
321 {"keyboard/images/brightness-down.svg", 321 {"keyboard/images/brightness-down.svg",
322 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN}, 322 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
323 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP}, 323 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
324 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW}, 324 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW},
325 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN}, 325 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
326 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD}, 326 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
327 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN}, 327 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
328 {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, 328 {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
329 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 329 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
330 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT}, 330 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
331 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE}, 331 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
332 {"keyboard/images/microphone-green.svg", 332 {"keyboard/images/microphone-green.svg",
333 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN}, 333 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
334 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE}, 334 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
335 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD}, 335 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
336 {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN}, 336 {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
337 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT}, 337 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
338 {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH}, 338 {"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH},
339 {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT}, 339 {"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT},
340 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN}, 340 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
341 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB}, 341 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
342 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP}, 342 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
343 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN}, 343 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
344 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP}, 344 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
345 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 345 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
346 {"keyboard/keyboard.js", IDR_KEYBOARD_JS}, 346 {"keyboard/keyboard.js", IDR_KEYBOARD_JS},
347 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC}, 347 {"keyboard/keyboard_mojo.js", IDR_KEYBOARD_MOJO_JS},
348 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY}, 348 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
349 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY}, 349 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
350 {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW}, 350 {"keyboard/layouts/system-qwerty.html",
351 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, 351 IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY},
352 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, 352 {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW},
353 {"keyboard/polymer_loader.js", IDR_KEYBOARD_POLYMER_LOADER}, 353 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
354 {"keyboard/roboto_bold.ttf", IDR_KEYBOARD_ROBOTO_BOLD_TTF}, 354 {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS},
355 {"keyboard/sounds/keypress-delete.wav", 355 {"keyboard/polymer_loader.js", IDR_KEYBOARD_POLYMER_LOADER},
356 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE}, 356 {"keyboard/roboto_bold.ttf", IDR_KEYBOARD_ROBOTO_BOLD_TTF},
357 {"keyboard/sounds/keypress-return.wav", 357 {"keyboard/sounds/keypress-delete.wav",
358 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN}, 358 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
359 {"keyboard/sounds/keypress-spacebar.wav", 359 {"keyboard/sounds/keypress-return.wav",
360 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR}, 360 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
361 {"keyboard/sounds/keypress-standard.wav", 361 {"keyboard/sounds/keypress-spacebar.wav",
362 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD}, 362 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
363 {"keyboard/sounds/keypress-standard.wav",
364 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
363 }; 365 };
364 static const size_t kKeyboardResourcesSize = arraysize(kKeyboardResources); 366 static const size_t kKeyboardResourcesSize = arraysize(kKeyboardResources);
365 *size = kKeyboardResourcesSize; 367 *size = kKeyboardResourcesSize;
366 return kKeyboardResources; 368 return kKeyboardResources;
367 } 369 }
368 370
369 void SetOverrideContentUrl(const GURL& url) { 371 void SetOverrideContentUrl(const GURL& url) {
370 g_override_content_url.Get() = url; 372 g_override_content_url.Get() = url;
371 } 373 }
372 374
373 const GURL& GetOverrideContentUrl() { 375 const GURL& GetOverrideContentUrl() {
374 return g_override_content_url.Get(); 376 return g_override_content_url.Get();
375 } 377 }
376 378
377 void LogKeyboardControlEvent(KeyboardControlEvent event) { 379 void LogKeyboardControlEvent(KeyboardControlEvent event) {
378 UMA_HISTOGRAM_ENUMERATION( 380 UMA_HISTOGRAM_ENUMERATION(
379 "VirtualKeyboard.KeyboardControlEvent", 381 "VirtualKeyboard.KeyboardControlEvent",
380 event, 382 event,
381 keyboard::KEYBOARD_CONTROL_MAX); 383 keyboard::KEYBOARD_CONTROL_MAX);
382 } 384 }
383 385
384 } // namespace keyboard 386 } // namespace keyboard
OLDNEW
« 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