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

Side by Side Diff: extensions/browser/api/mime_handler_private/mime_handler_private.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
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 "extensions/browser/api/mime_handler_private/mime_handler_private.h" 5 #include "extensions/browser/api/mime_handler_private/mime_handler_private.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "content/public/browser/stream_handle.h" 8 #include "content/public/browser/stream_handle.h"
9 #include "content/public/browser/stream_info.h" 9 #include "content/public/browser/stream_info.h"
10 #include "content/public/common/content_constants.h" 10 #include "content/public/common/content_constants.h"
11 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h" 11 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
12 #include "extensions/common/constants.h" 12 #include "extensions/common/constants.h"
13 #include "mojo/public/cpp/bindings/map.h"
13 #include "net/http/http_response_headers.h" 14 #include "net/http/http_response_headers.h"
14 #include "third_party/mojo/src/mojo/public/cpp/bindings/map.h"
15 15
16 namespace extensions { 16 namespace extensions {
17 namespace { 17 namespace {
18 18
19 mojo::Map<mojo::String, mojo::String> CreateResponseHeadersMap( 19 mojo::Map<mojo::String, mojo::String> CreateResponseHeadersMap(
20 const net::HttpResponseHeaders* headers) { 20 const net::HttpResponseHeaders* headers) {
21 std::map<std::string, std::string> result; 21 std::map<std::string, std::string> result;
22 if (!headers) 22 if (!headers)
23 return mojo::Map<mojo::String, mojo::String>::From(result); 23 return mojo::Map<mojo::String, mojo::String>::From(result);
24 24
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 result->original_url = info->original_url.spec(); 115 result->original_url = info->original_url.spec();
116 } 116 }
117 117
118 result->stream_url = info->handle->GetURL().spec(); 118 result->stream_url = info->handle->GetURL().spec();
119 result->response_headers = 119 result->response_headers =
120 extensions::CreateResponseHeadersMap(info->response_headers.get()); 120 extensions::CreateResponseHeadersMap(info->response_headers.get());
121 return result.Pass(); 121 return result.Pass();
122 } 122 }
123 123
124 } // namespace mojo 124 } // namespace mojo
OLDNEW
« no previous file with comments | « extensions/browser/api/mime_handler_private/mime_handler_private.h ('k') | extensions/browser/mojo/keep_alive_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698