components/html_viewer/web_mime_registry_impl.cc - Issue 1099303002: Move html_viewer from mojo/services to components.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/html_viewer/web_mime_registry_impl.cc

Issue 1099303002: Move html_viewer from mojo/services to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 8 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 | « components/html_viewer/web_mime_registry_impl.h ('k') | components/html_viewer/web_notification_manager_impl.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "mojo/services/html_viewer/web_mime_registry_impl.h"	5 #include "components/html_viewer/web_mime_registry_impl.h"

6	6

7 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

8 #include "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

9 #include "base/strings/sys_string_conversions.h"	9 #include "base/strings/sys_string_conversions.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "media/base/key_systems.h"	11 #include "media/base/key_systems.h"

12 #include "media/filters/stream_parser_factory.h"	12 #include "media/filters/stream_parser_factory.h"

13 #include "net/base/mime_util.h"	13 #include "net/base/mime_util.h"

14 #include "third_party/WebKit/public/platform/WebString.h"	14 #include "third_party/WebKit/public/platform/WebString.h"

15	15

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
127	127

128 blink::WebString WebMimeRegistryImpl::mimeTypeFromFile(	128 blink::WebString WebMimeRegistryImpl::mimeTypeFromFile(

129 const blink::WebString& file_path) {	129 const blink::WebString& file_path) {

130 std::string mime_type;	130 std::string mime_type;

131 net::GetMimeTypeFromFile(base::FilePath::FromUTF16Unsafe(file_path),	131 net::GetMimeTypeFromFile(base::FilePath::FromUTF16Unsafe(file_path),

132 &mime_type);	132 &mime_type);

133 return blink::WebString::fromUTF8(mime_type);	133 return blink::WebString::fromUTF8(mime_type);

134 }	134 }

135	135

136 } // namespace html_viewer	136 } // namespace html_viewer

OLD	NEW