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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: mojo/tools/roll/mojo_services_network.patch

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 10 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 | « mojo/tools/roll/cc_strip_video.patch ('k') | mojo/tools/roll/third_party_khronos.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/mojo/services/network/net_address_type_converters.h b/mojo/services /network/net_address_type_converters.h
2 index a1af10e..b4d1537 100644
3 --- a/mojo/services/network/net_address_type_converters.h
4 +++ b/mojo/services/network/net_address_type_converters.h
5 @@ -7,7 +7,7 @@
6
7 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
8 #include "net/base/ip_endpoint.h"
9 -#include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
10 +#include "mojo/public/cpp/bindings/type_converter.h"
11
12 namespace mojo {
13
14 diff --git a/mojo/services/network/network_service.cc b/mojo/services/network/ne twork_service.cc
15 index 8079ba1..6a82903 100644
16 --- a/mojo/services/network/network_service.cc
17 +++ b/mojo/services/network/network_service.cc
18 @@ -11,11 +11,11 @@
19 #include "mojo/application/application_runner_chromium.h"
20 #include "mojo/services/network/network_context.h"
21 #include "mojo/services/network/network_service_impl.h"
22 -#include "third_party/mojo/src/mojo/public/c/system/main.h"
23 -#include "third_party/mojo/src/mojo/public/cpp/application/application_connecti on.h"
24 -#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate .h"
25 -#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
26 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
27 +#include "mojo/public/c/system/main.h"
28 +#include "mojo/public/cpp/application/application_connection.h"
29 +#include "mojo/public/cpp/application/application_delegate.h"
30 +#include "mojo/public/cpp/application/interface_factory.h"
31 +#include "mojo/public/cpp/bindings/interface_ptr.h"
32
33 class NetworkServiceDelegate
34 : public mojo::ApplicationDelegate,
35 diff --git a/mojo/services/network/network_service_impl.cc b/mojo/services/netwo rk/network_service_impl.cc
36 index 64eb337..2ea696e 100644
37 --- a/mojo/services/network/network_service_impl.cc
38 +++ b/mojo/services/network/network_service_impl.cc
39 @@ -10,7 +10,7 @@
40 #include "mojo/services/network/udp_socket_impl.h"
41 #include "mojo/services/network/url_loader_impl.h"
42 #include "mojo/services/network/web_socket_impl.h"
43 -#include "third_party/mojo/src/mojo/public/cpp/application/application_connecti on.h"
44 +#include "mojo/public/cpp/application/application_connection.h"
45
46 namespace mojo {
47
48 diff --git a/mojo/services/network/network_service_impl.h b/mojo/services/networ k/network_service_impl.h
49 index 9d4baae..41c5a69 100644
50 --- a/mojo/services/network/network_service_impl.h
51 +++ b/mojo/services/network/network_service_impl.h
52 @@ -7,7 +7,7 @@
53
54 #include "base/compiler_specific.h"
55 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
56 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
57 +#include "mojo/public/cpp/bindings/interface_impl.h"
58 #include "url/gurl.h"
59
60 namespace mojo {
61 diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.cc b/mojo/servi ces/network/public/cpp/udp_socket_wrapper.cc
62 index 4510c27..8d8b7ea 100644
63 --- a/mojo/services/network/public/cpp/udp_socket_wrapper.cc
64 +++ b/mojo/services/network/public/cpp/udp_socket_wrapper.cc
65 @@ -6,7 +6,7 @@
66
67 #include <assert.h>
68
69 -#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h"
70 +#include "mojo/public/cpp/environment/logging.h"
71
72 namespace mojo {
73 namespace {
74 diff --git a/mojo/services/network/public/cpp/web_socket_read_queue.h b/mojo/ser vices/network/public/cpp/web_socket_read_queue.h
75 index 2731510..905f94e 100644
76 --- a/mojo/services/network/public/cpp/web_socket_read_queue.h
77 +++ b/mojo/services/network/public/cpp/web_socket_read_queue.h
78 @@ -8,7 +8,7 @@
79 #include "base/callback.h"
80 #include "base/memory/scoped_vector.h"
81 #include "mojo/common/handle_watcher.h"
82 -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
83 +#include "mojo/public/cpp/system/data_pipe.h"
84
85 namespace mojo {
86
87 diff --git a/mojo/services/network/public/cpp/web_socket_write_queue.h b/mojo/se rvices/network/public/cpp/web_socket_write_queue.h
88 index b2c48fc..e683be4 100644
89 --- a/mojo/services/network/public/cpp/web_socket_write_queue.h
90 +++ b/mojo/services/network/public/cpp/web_socket_write_queue.h
91 @@ -8,7 +8,7 @@
92 #include "base/callback.h"
93 #include "base/memory/scoped_vector.h"
94 #include "mojo/common/handle_watcher.h"
95 -#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
96 +#include "mojo/public/cpp/system/data_pipe.h"
97
98 namespace mojo {
99
100 diff --git a/mojo/services/network/tcp_bound_socket_impl.h b/mojo/services/netwo rk/tcp_bound_socket_impl.h
101 index e5e1b6c..7a281c5 100644
102 --- a/mojo/services/network/tcp_bound_socket_impl.h
103 +++ b/mojo/services/network/tcp_bound_socket_impl.h
104 @@ -8,7 +8,7 @@
105 #include "base/memory/scoped_ptr.h"
106 #include "mojo/services/network/public/interfaces/tcp_bound_socket.mojom.h"
107 #include "net/socket/tcp_socket.h"
108 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
109 +#include "mojo/public/cpp/bindings/interface_impl.h"
110
111 namespace mojo {
112
113 diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/n etwork/tcp_connected_socket_impl.h
114 index 0eb95e2..106d47a 100644
115 --- a/mojo/services/network/tcp_connected_socket_impl.h
116 +++ b/mojo/services/network/tcp_connected_socket_impl.h
117 @@ -10,7 +10,7 @@
118 #include "mojo/common/handle_watcher.h"
119 #include "mojo/services/network/public/interfaces/tcp_connected_socket.mojom.h"
120 #include "net/socket/tcp_socket.h"
121 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
122 +#include "mojo/public/cpp/bindings/interface_impl.h"
123
124 namespace mojo {
125
126 diff --git a/mojo/services/network/tcp_server_socket_impl.h b/mojo/services/netw ork/tcp_server_socket_impl.h
127 index 0039f8d..978830a 100644
128 --- a/mojo/services/network/tcp_server_socket_impl.h
129 +++ b/mojo/services/network/tcp_server_socket_impl.h
130 @@ -9,7 +9,7 @@
131 #include "mojo/services/network/public/interfaces/tcp_server_socket.mojom.h"
132 #include "net/base/ip_endpoint.h"
133 #include "net/socket/tcp_socket.h"
134 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
135 +#include "mojo/public/cpp/bindings/interface_impl.h"
136
137 namespace mojo {
138
139 diff --git a/mojo/services/network/udp_socket_impl.h b/mojo/services/network/udp _socket_impl.h
140 index eb63d93..1d8c9f3 100644
141 --- a/mojo/services/network/udp_socket_impl.h
142 +++ b/mojo/services/network/udp_socket_impl.h
143 @@ -12,7 +12,7 @@
144 #include "mojo/services/network/public/interfaces/udp_socket.mojom.h"
145 #include "net/base/ip_endpoint.h"
146 #include "net/udp/udp_socket.h"
147 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
148 +#include "mojo/public/cpp/bindings/interface_impl.h"
149
150 namespace net {
151 class IOBuffer;
152 diff --git a/mojo/services/network/udp_socket_unittest.cc b/mojo/services/networ k/udp_socket_unittest.cc
153 index ddb9d93..6982803 100644
154 --- a/mojo/services/network/udp_socket_unittest.cc
155 +++ b/mojo/services/network/udp_socket_unittest.cc
156 @@ -11,7 +11,7 @@
157 #include "mojo/shell/shell_test_helper.h"
158 #include "net/base/net_errors.h"
159 #include "testing/gtest/include/gtest/gtest.h"
160 -#include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"
161 +#include "mojo/public/cpp/bindings/callback.h"
162 #include "url/gurl.h"
163
164 namespace mojo {
165 diff --git a/mojo/services/network/url_loader_impl.h b/mojo/services/network/url _loader_impl.h
166 index 8c259bd..ec06ec5 100644
167 --- a/mojo/services/network/url_loader_impl.h
168 +++ b/mojo/services/network/url_loader_impl.h
169 @@ -11,9 +11,9 @@
170 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
171 #include "net/base/net_errors.h"
172 #include "net/url_request/url_request.h"
173 -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
174 -#include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
175 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
176 +#include "mojo/public/cpp/bindings/binding.h"
177 +#include "mojo/public/cpp/bindings/error_handler.h"
178 +#include "mojo/public/cpp/bindings/interface_impl.h"
179
180 namespace mojo {
181
182 diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web _socket_impl.h
183 index bb41104..07aa327 100644
184 --- a/mojo/services/network/web_socket_impl.h
185 +++ b/mojo/services/network/web_socket_impl.h
186 @@ -7,7 +7,7 @@
187
188 #include "base/memory/scoped_ptr.h"
189 #include "mojo/services/network/public/interfaces/web_socket.mojom.h"
190 -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
191 +#include "mojo/public/cpp/bindings/interface_impl.h"
192
193 namespace net {
194 class WebSocketChannel;
OLDNEW
« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | mojo/tools/roll/third_party_khronos.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698