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

Side by Side Diff: net/base/mime_util.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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 | « media/tools/player_wtl/movie.cc ('k') | net/base/net_util_win.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 (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 <string> 5 #include <string>
6 6
7 #include "net/base/mime_util.h" 7 #include "net/base/mime_util.h"
8 #include "net/base/platform_mime_util.h" 8 #include "net/base/platform_mime_util.h"
9 9
10 #include "base/hash_tables.h" 10 #include "base/hash_tables.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/singleton.h" 12 #include "base/singleton.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h"
14 15
15 using std::string; 16 using std::string;
16 17
17 namespace net { 18 namespace net {
18 19
19 // Singleton utility class for mime types. 20 // Singleton utility class for mime types.
20 class MimeUtil : public PlatformMimeUtil { 21 class MimeUtil : public PlatformMimeUtil {
21 public: 22 public:
22 bool GetMimeTypeFromExtension(const FilePath::StringType& ext, 23 bool GetMimeTypeFromExtension(const FilePath::StringType& ext,
23 std::string* mime_type) const; 24 std::string* mime_type) const;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs) { 442 bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs) {
442 return GetMimeUtil()->AreSupportedMediaCodecs(codecs); 443 return GetMimeUtil()->AreSupportedMediaCodecs(codecs);
443 } 444 }
444 445
445 void ParseCodecString(const std::string& codecs, 446 void ParseCodecString(const std::string& codecs,
446 std::vector<std::string>* codecs_out) { 447 std::vector<std::string>* codecs_out) {
447 GetMimeUtil()->ParseCodecString(codecs, codecs_out); 448 GetMimeUtil()->ParseCodecString(codecs, codecs_out);
448 } 449 }
449 450
450 } // namespace net 451 } // namespace net
OLDNEW
« no previous file with comments | « media/tools/player_wtl/movie.cc ('k') | net/base/net_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698