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

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

Issue 1033773002: Fixes grit not pulling in material design files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix >80 line length Created 5 years, 9 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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER}, 363 {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER},
364 {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS}, 364 {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS},
365 {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS}, 365 {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS},
366 {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101}, 366 {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101},
367 {"keyboard/inputview_layouts/compactkbd-qwerty.js", 367 {"keyboard/inputview_layouts/compactkbd-qwerty.js",
368 IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY}, 368 IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY},
369 {"keyboard/inputview_layouts/compactkbd-numberpad.js", 369 {"keyboard/inputview_layouts/compactkbd-numberpad.js",
370 IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD}, 370 IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD},
371 {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI}, 371 {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI},
372 {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT}, 372 {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT},
373 {"keyboard/inputview_layouts/m-101kbd.js",
374 IDR_KEYBOARD_LAYOUTS_MATERIAL_101},
375 {"keyboard/inputview_layouts/m-compactkbd-qwerty.js",
376 IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_QWERTY},
377 {"keyboard/inputview_layouts/m-compactkbd-numberpad.js",
378 IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_NUMBERPAD},
379 {"keyboard/inputview_layouts/m-emoji.js",
380 IDR_KEYBOARD_LAYOUTS_MATERIAL_EMOJI},
381 {"keyboard/inputview_layouts/m-handwriting.js",
382 IDR_KEYBOARD_LAYOUTS_MATERIAL_HWT},
373 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, 383 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
374 {"keyboard/sounds/keypress-delete.wav", 384 {"keyboard/sounds/keypress-delete.wav",
375 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE}, 385 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
376 {"keyboard/sounds/keypress-return.wav", 386 {"keyboard/sounds/keypress-return.wav",
377 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN}, 387 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
378 {"keyboard/sounds/keypress-spacebar.wav", 388 {"keyboard/sounds/keypress-spacebar.wav",
379 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR}, 389 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
380 {"keyboard/sounds/keypress-standard.wav", 390 {"keyboard/sounds/keypress-standard.wav",
381 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD}, 391 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
382 }; 392 };
(...skipping 11 matching lines...) Expand all
394 } 404 }
395 405
396 void LogKeyboardControlEvent(KeyboardControlEvent event) { 406 void LogKeyboardControlEvent(KeyboardControlEvent event) {
397 UMA_HISTOGRAM_ENUMERATION( 407 UMA_HISTOGRAM_ENUMERATION(
398 "VirtualKeyboard.KeyboardControlEvent", 408 "VirtualKeyboard.KeyboardControlEvent",
399 event, 409 event,
400 keyboard::KEYBOARD_CONTROL_MAX); 410 keyboard::KEYBOARD_CONTROL_MAX);
401 } 411 }
402 412
403 } // namespace keyboard 413 } // 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