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

Side by Side Diff: mojo/services/network/http_server_impl.h

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 | « mojo/services/network/http_server_apptest.cc ('k') | mojo/services/network/main.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 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 #ifndef MOJO_SERVICES_NETWORK_HTTP_SERVER_IMPL_H_ 5 #ifndef MOJO_SERVICES_NETWORK_HTTP_SERVER_IMPL_H_
6 #define MOJO_SERVICES_NETWORK_HTTP_SERVER_IMPL_H_ 6 #define MOJO_SERVICES_NETWORK_HTTP_SERVER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "mojo/application/app_lifetime_helper.h" 13 #include "mojo/application/public/cpp/app_lifetime_helper.h"
14 #include "mojo/services/network/public/interfaces/http_server.mojom.h" 14 #include "mojo/services/network/public/interfaces/http_server.mojom.h"
15 #include "mojo/services/network/public/interfaces/net_address.mojom.h" 15 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
16 #include "net/server/http_server.h" 16 #include "net/server/http_server.h"
17 #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h" 17 #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
18 18
19 namespace net { 19 namespace net {
20 class HttpServer; 20 class HttpServer;
21 } 21 }
22 22
23 namespace mojo { 23 namespace mojo {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 scoped_ptr<net::HttpServer> server_; 64 scoped_ptr<net::HttpServer> server_;
65 65
66 std::map<int, linked_ptr<HttpConnectionImpl>> connections_; 66 std::map<int, linked_ptr<HttpConnectionImpl>> connections_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(HttpServerImpl); 68 DISALLOW_COPY_AND_ASSIGN(HttpServerImpl);
69 }; 69 };
70 70
71 } // namespace mojo 71 } // namespace mojo
72 72
73 #endif // MOJO_SERVICES_NETWORK_HTTP_SERVER_IMPL_H_ 73 #endif // MOJO_SERVICES_NETWORK_HTTP_SERVER_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/network/http_server_apptest.cc ('k') | mojo/services/network/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698