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

Side by Side Diff: media/base/media_resources.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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 | « media/base/media_resources.h ('k') | media/base/media_switches.cc » ('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 "media/base/media_resources.h" 5 #include "media/base/media_resources.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "build/build_config.h"
9 10
10 namespace media { 11 namespace media {
11 12
12 static LocalizedStringProvider g_localized_string_provider = nullptr; 13 static LocalizedStringProvider g_localized_string_provider = nullptr;
13 14
14 void SetLocalizedStringProvider(LocalizedStringProvider func) { 15 void SetLocalizedStringProvider(LocalizedStringProvider func) {
15 g_localized_string_provider = func; 16 g_localized_string_provider = func;
16 } 17 }
17 18
18 #if !defined(OS_IOS) 19 #if !defined(OS_IOS)
19 std::string GetLocalizedStringUTF8(MessageId message_id) { 20 std::string GetLocalizedStringUTF8(MessageId message_id) {
20 return base::UTF16ToUTF8(GetLocalizedStringUTF16(message_id)); 21 return base::UTF16ToUTF8(GetLocalizedStringUTF16(message_id));
21 } 22 }
22 23
23 base::string16 GetLocalizedStringUTF16(MessageId message_id) { 24 base::string16 GetLocalizedStringUTF16(MessageId message_id) {
24 return g_localized_string_provider ? g_localized_string_provider(message_id) 25 return g_localized_string_provider ? g_localized_string_provider(message_id)
25 : base::string16(); 26 : base::string16();
26 } 27 }
27 #endif 28 #endif
28 29
29 } // namespace media 30 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media_resources.h ('k') | media/base/media_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698