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

Side by Side Diff: webkit/renderer/media/crypto/key_systems.cc

Issue 16739016: Use a direct include of strings headers in webkit/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing include from ordering Created 7 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 <map> 5 #include <map>
6 6
7 #include "webkit/renderer/media/crypto/key_systems.h" 7 #include "webkit/renderer/media/crypto/key_systems.h"
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "net/base/mime_util.h" 12 #include "net/base/mime_util.h"
13 #include "third_party/WebKit/public/platform/WebCString.h" 13 #include "third_party/WebKit/public/platform/WebCString.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 14 #include "third_party/WebKit/public/platform/WebString.h"
15 #include "webkit/renderer/media/crypto/key_systems_info.h" 15 #include "webkit/renderer/media/crypto/key_systems_info.h"
16 16
17 namespace webkit_media { 17 namespace webkit_media {
18 18
19 // Convert a WebString to ASCII, falling back on an empty string in the case 19 // Convert a WebString to ASCII, falling back on an empty string in the case
20 // of a non-ASCII string. 20 // of a non-ASCII string.
21 static std::string ToASCIIOrEmpty(const WebKit::WebString& string) { 21 static std::string ToASCIIOrEmpty(const WebKit::WebString& string) {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 for (int i = 0; i < kNumKeySystemToPepperTypeMapping; ++i) { 154 for (int i = 0; i < kNumKeySystemToPepperTypeMapping; ++i) {
155 if (kKeySystemToPepperTypeMapping[i].key_system == key_system) 155 if (kKeySystemToPepperTypeMapping[i].key_system == key_system)
156 return kKeySystemToPepperTypeMapping[i].type; 156 return kKeySystemToPepperTypeMapping[i].type;
157 } 157 }
158 158
159 return std::string(); 159 return std::string();
160 } 160 }
161 #endif // defined(ENABLE_PEPPER_CDMS) 161 #endif // defined(ENABLE_PEPPER_CDMS)
162 162
163 } // namespace webkit_media 163 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/renderer/media/cache_util_unittest.cc ('k') | webkit/renderer/media/test_response_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698