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

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: Created 6 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 | Annotate | Revision Log
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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 } 259 }
260 } 260 }
261 261
262 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { 262 const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
263 // This looks a lot like the contents of a resource map; however it is 263 // This looks a lot like the contents of a resource map; however it is
264 // necessary to have a custom path for the extension path, so the resource 264 // necessary to have a custom path for the extension path, so the resource
265 // map cannot be used directly. 265 // map cannot be used directly.
266 static const GritResourceMap kKeyboardResources[] = { 266 static const GritResourceMap kKeyboardResources[] = {
267 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW}, 267 {"keyboard/layouts/function-key-row.html", IDR_KEYBOARD_FUNCTION_KEY_ROW},
268 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK}, 268 {"keyboard/images/back.svg", IDR_KEYBOARD_IMAGES_BACK},
269 {"keyboard/images/backspace.svg", IDR_KEYBOARD_IMAGES_BACKSPACE}, 269 {"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE},
270 {"keyboard/images/brightness-down.svg", 270 {"keyboard/images/brightness-down.svg",
271 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN}, 271 IDR_KEYBOARD_IMAGES_BRIGHTNESS_DOWN},
272 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP}, 272 {"keyboard/images/brightness-up.svg", IDR_KEYBOARD_IMAGES_BRIGHTNESS_UP},
273 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW}, 273 {"keyboard/images/change-window.svg", IDR_KEYBOARD_IMAGES_CHANGE_WINDOW},
274 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN}, 274 {"keyboard/images/down.svg", IDR_KEYBOARD_IMAGES_DOWN},
275 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD}, 275 {"keyboard/images/forward.svg", IDR_KEYBOARD_IMAGES_FORWARD},
276 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN}, 276 {"keyboard/images/fullscreen.svg", IDR_KEYBOARD_IMAGES_FULLSCREEN},
277 {"keyboard/images/hide-keyboard.svg", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, 277 {"keyboard/images/hide-keyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD},
278 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, 278 {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD},
279 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT}, 279 {"keyboard/images/left.svg", IDR_KEYBOARD_IMAGES_LEFT},
280 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE}, 280 {"keyboard/images/microphone.svg", IDR_KEYBOARD_IMAGES_MICROPHONE},
281 {"keyboard/images/microphone-green.svg", 281 {"keyboard/images/microphone-green.svg",
282 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN}, 282 IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN},
283 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE}, 283 {"keyboard/images/mute.svg", IDR_KEYBOARD_IMAGES_MUTE},
284 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD}, 284 {"keyboard/images/reload.svg", IDR_KEYBOARD_IMAGES_RELOAD},
285 {"keyboard/images/return.svg", IDR_KEYBOARD_IMAGES_RETURN}, 285 {"keyboard/images/return.png", IDR_KEYBOARD_IMAGES_RETURN},
286 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT}, 286 {"keyboard/images/right.svg", IDR_KEYBOARD_IMAGES_RIGHT},
287 {"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH}, 287 {"keyboard/images/search.svg", IDR_KEYBOARD_IMAGES_SEARCH},
288 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, 288 {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT},
289 {"keyboard/images/shift-filled.svg", IDR_KEYBOARD_IMAGES_SHIFT_FILLED}, 289 {"keyboard/images/shift-filled.svg", IDR_KEYBOARD_IMAGES_SHIFT_FILLED},
290 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN}, 290 {"keyboard/images/shutdown.svg", IDR_KEYBOARD_IMAGES_SHUTDOWN},
291 {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB}, 291 {"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB},
292 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP}, 292 {"keyboard/images/up.svg", IDR_KEYBOARD_IMAGES_UP},
293 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN}, 293 {"keyboard/images/volume-down.svg", IDR_KEYBOARD_IMAGES_VOLUME_DOWN},
294 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP}, 294 {"keyboard/images/volume-up.svg", IDR_KEYBOARD_IMAGES_VOLUME_UP},
295 {"keyboard/index.html", IDR_KEYBOARD_INDEX}, 295 {"keyboard/index.html", IDR_KEYBOARD_INDEX},
296 {"keyboard/keyboard.js", IDR_KEYBOARD_JS}, 296 {"keyboard/keyboard.js", IDR_KEYBOARD_JS},
297 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC}, 297 {"keyboard/layouts/numeric.html", IDR_KEYBOARD_LAYOUTS_NUMERIC},
298 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY}, 298 {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY},
299 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY}, 299 {"keyboard/layouts/system-qwerty.html", IDR_KEYBOARD_LAYOUTS_SYSTEM_QWERTY},
300 {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW}, 300 {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW},
301 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, 301 {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
(...skipping 23 matching lines...) Expand all
325 } 325 }
326 326
327 void LogKeyboardControlEvent(KeyboardControlEvent event) { 327 void LogKeyboardControlEvent(KeyboardControlEvent event) {
328 UMA_HISTOGRAM_ENUMERATION( 328 UMA_HISTOGRAM_ENUMERATION(
329 "VirtualKeyboard.KeyboardControlEvent", 329 "VirtualKeyboard.KeyboardControlEvent",
330 event, 330 event,
331 keyboard::KEYBOARD_CONTROL_MAX); 331 keyboard::KEYBOARD_CONTROL_MAX);
332 } 332 }
333 333
334 } // namespace keyboard 334 } // namespace keyboard
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698