diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-10 16:56:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-25 10:00:35 +0000 |
| commit | 44d980ff67867cb65bfe8035326be2b461ca7172 (patch) | |
| tree | b17af444fe62213fd7ea4d740c1abbe8d6b1002d /src/core/dev_tools_http_handler_delegate_qt.cpp | |
| parent | 38944be4048e19a0ab6f3b8961f58e36048b53a8 (diff) | |
Rebasing on Chromium 45
Fixing the minor differences needed to work with Chromium 45.
Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/dev_tools_http_handler_delegate_qt.cpp')
| -rw-r--r-- | src/core/dev_tools_http_handler_delegate_qt.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp index 2afd75e6e..793ed0981 100644 --- a/src/core/dev_tools_http_handler_delegate_qt.cpp +++ b/src/core/dev_tools_http_handler_delegate_qt.cpp @@ -62,7 +62,6 @@ #include "content/public/common/content_switches.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" -#include "net/socket/stream_listen_socket.h" #include "net/socket/tcp_server_socket.h" using namespace content; |