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

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

Issue 1022143003: Removes flag --enable-new-md-input-view and add a opposite flag: --disable-new-md-input-view. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 logged = true; 319 logged = true;
320 } 320 }
321 } 321 }
322 322
323 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { 323 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
324 // This looks a lot like the contents of a resource map; however it is 324 // This looks a lot like the contents of a resource map; however it is
325 // necessary to have a custom path for the extension path, so the resource 325 // necessary to have a custom path for the extension path, so the resource
326 // map cannot be used directly. 326 // map cannot be used directly.
327 static const GritResourceMap kKeyboardResources[] = { 327 static const GritResourceMap kKeyboardResources[] = {
328 {"keyboard/locales/en.js", IDR_KEYBOARD_LOCALES_EN}, 328 {"keyboard/locales/en.js", IDR_KEYBOARD_LOCALES_EN},
329 {"keyboard/config/emoji.js", IDR_KEYBOARD_CONFIG_EMOJI}, 329 {"keyboard/config/m-emoji.js", IDR_KEYBOARD_CONFIG_EMOJI},
330 {"keyboard/config/hwt.js", IDR_KEYBOARD_CONFIG_HWT}, 330 {"keyboard/config/m-hwt.js", IDR_KEYBOARD_CONFIG_HWT},
331 {"keyboard/config/us.js", IDR_KEYBOARD_CONFIG_US}, 331 {"keyboard/config/us.js", IDR_KEYBOARD_CONFIG_US},
332 {"keyboard/emoji.css", IDR_KEYBOARD_CSS_EMOJI}, 332 {"keyboard/emoji.css", IDR_KEYBOARD_CSS_EMOJI},
333 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE}, 333 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
334 {"keyboard/images/car.png", IDR_KEYBOARD_IMAGES_CAR}, 334 {"keyboard/images/car.png", IDR_KEYBOARD_IMAGES_CAR},
335 {"keyboard/images/check.png", IDR_KEYBOARD_IMAGES_CHECK}, 335 {"keyboard/images/check.png", IDR_KEYBOARD_IMAGES_CHECK},
336 {"keyboard/images/compact.png", IDR_KEYBOARD_IMAGES_COMPACT}, 336 {"keyboard/images/compact.png", IDR_KEYBOARD_IMAGES_COMPACT},
337 {"keyboard/images/down.png", IDR_KEYBOARD_IMAGES_DOWN}, 337 {"keyboard/images/down.png", IDR_KEYBOARD_IMAGES_DOWN},
338 {"keyboard/images/emoji.png", IDR_KEYBOARD_IMAGES_EMOJI}, 338 {"keyboard/images/emoji.png", IDR_KEYBOARD_IMAGES_EMOJI},
339 {"keyboard/images/emoji_cat_items.png", IDR_KEYBOARD_IMAGES_CAT}, 339 {"keyboard/images/emoji_cat_items.png", IDR_KEYBOARD_IMAGES_CAT},
340 {"keyboard/images/emoticon.png", IDR_KEYBOARD_IMAGES_EMOTICON}, 340 {"keyboard/images/emoticon.png", IDR_KEYBOARD_IMAGES_EMOTICON},
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 404 }
405 405
406 void LogKeyboardControlEvent(KeyboardControlEvent event) { 406 void LogKeyboardControlEvent(KeyboardControlEvent event) {
407 UMA_HISTOGRAM_ENUMERATION( 407 UMA_HISTOGRAM_ENUMERATION(
408 "VirtualKeyboard.KeyboardControlEvent", 408 "VirtualKeyboard.KeyboardControlEvent",
409 event, 409 event,
410 keyboard::KEYBOARD_CONTROL_MAX); 410 keyboard::KEYBOARD_CONTROL_MAX);
411 } 411 }
412 412
413 } // 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