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

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

Issue 946623002: [Code cleanup]Remove webui keyboard mojo binding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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') | 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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER}, 353 {"keyboard/inputview_adapter.js", IDR_KEYBOARD_INPUTVIEW_ADAPTER},
354 {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS}, 354 {"keyboard/inputview.css", IDR_KEYBOARD_INPUTVIEW_CSS},
355 {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS}, 355 {"keyboard/inputview.js", IDR_KEYBOARD_INPUTVIEW_JS},
356 {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101}, 356 {"keyboard/inputview_layouts/101kbd.js", IDR_KEYBOARD_LAYOUTS_101},
357 {"keyboard/inputview_layouts/compactkbd-qwerty.js", 357 {"keyboard/inputview_layouts/compactkbd-qwerty.js",
358 IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY}, 358 IDR_KEYBOARD_LAYOUTS_COMPACT_QWERTY},
359 {"keyboard/inputview_layouts/compactkbd-numberpad.js", 359 {"keyboard/inputview_layouts/compactkbd-numberpad.js",
360 IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD}, 360 IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD},
361 {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI}, 361 {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI},
362 {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT}, 362 {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT},
363 {"keyboard/keyboard_mojo.js", IDR_KEYBOARD_MOJO_JS},
364 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, 363 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
365 {"keyboard/sounds/keypress-delete.wav", 364 {"keyboard/sounds/keypress-delete.wav",
366 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE}, 365 IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
367 {"keyboard/sounds/keypress-return.wav", 366 {"keyboard/sounds/keypress-return.wav",
368 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN}, 367 IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN},
369 {"keyboard/sounds/keypress-spacebar.wav", 368 {"keyboard/sounds/keypress-spacebar.wav",
370 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR}, 369 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
371 {"keyboard/sounds/keypress-standard.wav", 370 {"keyboard/sounds/keypress-standard.wav",
372 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD}, 371 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
373 }; 372 };
(...skipping 11 matching lines...) Expand all
385 } 384 }
386 385
387 void LogKeyboardControlEvent(KeyboardControlEvent event) { 386 void LogKeyboardControlEvent(KeyboardControlEvent event) {
388 UMA_HISTOGRAM_ENUMERATION( 387 UMA_HISTOGRAM_ENUMERATION(
389 "VirtualKeyboard.KeyboardControlEvent", 388 "VirtualKeyboard.KeyboardControlEvent",
390 event, 389 event,
391 keyboard::KEYBOARD_CONTROL_MAX); 390 keyboard::KEYBOARD_CONTROL_MAX);
392 } 391 }
393 392
394 } // namespace keyboard 393 } // 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