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

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

Issue 1131263011: Remove an old TODO in net/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/base/platform_mime_util.h" 5 #include "net/base/platform_mime_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 11
12 #if defined(OS_ANDROID) 12 #if defined(OS_ANDROID)
13 #include "net/android/network_library.h" 13 #include "net/android/network_library.h"
14 #else 14 #else
15 #include "base/nix/mime_util_xdg.h" 15 #include "base/nix/mime_util_xdg.h"
16 #endif 16 #endif
17 17
18 namespace net { 18 namespace net {
19 19
20 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
21 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension( 21 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
22 const base::FilePath::StringType& ext, std::string* result) const { 22 const base::FilePath::StringType& ext, std::string* result) const {
23 return android::GetMimeTypeFromExtension(ext, result); 23 return android::GetMimeTypeFromExtension(ext, result);
24 } 24 }
25 #else 25 #else
26 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension( 26 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
27 const base::FilePath::StringType& ext, std::string* result) const { 27 const base::FilePath::StringType& ext, std::string* result) const {
28 // TODO(thestig): This is a temporary hack until we can fix this
29 // properly in test shell / webkit.
30 // We have to play dumb and not return application/x-perl here
31 // to make the reload-subframe-object layout test happy.
32 if (ext == "pl")
33 return false;
34
35 base::FilePath dummy_path("foo." + ext); 28 base::FilePath dummy_path("foo." + ext);
36 std::string out = base::nix::GetFileMimeType(dummy_path); 29 std::string out = base::nix::GetFileMimeType(dummy_path);
37 30
38 // GetFileMimeType likes to return application/octet-stream 31 // GetFileMimeType likes to return application/octet-stream
39 // for everything it doesn't know - ignore that. 32 // for everything it doesn't know - ignore that.
40 if (out == "application/octet-stream" || out.empty()) 33 if (out == "application/octet-stream" || out.empty())
41 return false; 34 return false;
42 35
43 // GetFileMimeType returns image/x-ico because that's what's in the XDG 36 // GetFileMimeType returns image/x-ico because that's what's in the XDG
44 // mime database. That database is the merger of the Gnome and KDE mime 37 // mime database. That database is the merger of the Gnome and KDE mime
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 94
102 void PlatformMimeUtil::GetPlatformExtensionsForMimeType( 95 void PlatformMimeUtil::GetPlatformExtensionsForMimeType(
103 const std::string& mime_type, 96 const std::string& mime_type,
104 base::hash_set<base::FilePath::StringType>* extensions) const { 97 base::hash_set<base::FilePath::StringType>* extensions) const {
105 base::FilePath::StringType ext; 98 base::FilePath::StringType ext;
106 if (GetPreferredExtensionForMimeType(mime_type, &ext)) 99 if (GetPreferredExtensionForMimeType(mime_type, &ext))
107 extensions->insert(ext); 100 extensions->insert(ext);
108 } 101 }
109 102
110 } // namespace net 103 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698