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

Side by Side Diff: ui/keyboard/content/keyboard_content_util.cc

Issue 1550483002: Switch to standard integer types in ui/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-ui-events
Patch Set: Created 4 years, 12 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/content/keyboard_content_util.h ('k') | ui/keyboard/content/keyboard_ui_content.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/content/keyboard_content_util.h" 5 #include "ui/keyboard/content/keyboard_content_util.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/macros.h"
8 #include "grit/keyboard_resources.h" 9 #include "grit/keyboard_resources.h"
9 #include "grit/keyboard_resources_map.h" 10 #include "grit/keyboard_resources_map.h"
10 #include "url/gurl.h" 11 #include "url/gurl.h"
11 12
12 namespace keyboard { 13 namespace keyboard {
13 namespace { 14 namespace {
14 15
15 base::LazyInstance<GURL> g_override_content_url = LAZY_INSTANCE_INITIALIZER; 16 base::LazyInstance<GURL> g_override_content_url = LAZY_INSTANCE_INITIALIZER;
16 17
17 } // namespace 18 } // namespace
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 {"keyboard/sounds/keypress-spacebar.wav", 100 {"keyboard/sounds/keypress-spacebar.wav",
100 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR}, 101 IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
101 {"keyboard/sounds/keypress-standard.wav", 102 {"keyboard/sounds/keypress-standard.wav",
102 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD}, 103 IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
103 }; 104 };
104 *size = arraysize(kKeyboardResources); 105 *size = arraysize(kKeyboardResources);
105 return kKeyboardResources; 106 return kKeyboardResources;
106 } 107 }
107 108
108 } // namespace keyboard 109 } // namespace keyboard
OLDNEW
« no previous file with comments | « ui/keyboard/content/keyboard_content_util.h ('k') | ui/keyboard/content/keyboard_ui_content.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698