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

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

Issue 252743002: Update Virtual Keybaord icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Uprev. Created 6 years, 7 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/elements/kb-key.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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 277 }
278 } 278 }
279 279
280 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { 280 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
281 // This looks a lot like the contents of a resource map; however it is 281 // This looks a lot like the contents of a resource map; however it is
282 // necessary to have a custom path for the extension path, so the resource 282 // necessary to have a custom path for the extension path, so the resource
283 // map cannot be used directly. 283 // map cannot be used directly.
284 static const GritResourceMap kKeyboardResources[] = { 284 static const GritResourceMap kKeyboardResources[] = {
285 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW}, 285 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
286 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK}, 286 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
287 {"keyboard/images/backspace.svg", IDR_KEYBOARD_IMAGES_BACKSPACE}, 287 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
288 {"keyboard/images/brightness-down.svg", 288 {"keyboard/images/brightness-down.svg",
289 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN}, 289 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
290 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP}, 290 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
291 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW}, 291 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW},
292 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN}, 292 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
293 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD}, 293 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
294 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN}, 294 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
295 {"keyboard/images/hide-keyboard.svg", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, 295 {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
296 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 296 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
297 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT}, 297 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
298 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE}, 298 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
299 {"keyboard/images/microphone-green.svg", 299 {"keyboard/images/microphone-green.svg",
300 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN}, 300 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
301 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE}, 301 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
302 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD}, 302 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
303 {"keyboard/images/return.svg", IDR_KEYBOARD_IMAGES_RETURN}, 303 {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
304 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT}, 304 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
305 {"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH}, 305 {"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH},
306 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, 306 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
307 {"keyboard/images/shift-filled.svg", IDR_KEYBOARD_IMAGES_SHIFT_FILLED}, 307 {"keyboard/images/shift-filled.svg", IDR_KEYBOARD_IMAGES_SHIFT_FILLED},
308 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN}, 308 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
309 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB}, 309 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
310 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP}, 310 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
311 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN}, 311 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
312 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP}, 312 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
313 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 313 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
314 {"keyboard/keyboard.js", IDR_KEYBOARD_JS}, 314 {"keyboard/keyboard.js", IDR_KEYBOARD_JS},
315 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC}, 315 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
316 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY}, 316 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
317 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY}, 317 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY},
318 {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW}, 318 {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW},
319 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, 319 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
(...skipping 23 matching lines...) Expand all
343 } 343 }
344 344
345 void LogKeyboardControlEvent(KeyboardControlEvent event) { 345 void LogKeyboardControlEvent(KeyboardControlEvent event) {
346 UMA_HISTOGRAM_ENUMERATION( 346 UMA_HISTOGRAM_ENUMERATION(
347 "VirtualKeyboard.KeyboardControlEvent", 347 "VirtualKeyboard.KeyboardControlEvent",
348 event, 348 event,
349 keyboard::KEYBOARD_CONTROL_MAX); 349 keyboard::KEYBOARD_CONTROL_MAX);
350 } 350 }
351 351
352 } // namespace keyboard 352 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | ui/keyboard/resources/elements/kb-key.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698