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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1230313005: split port_util.h off of net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove garbage that got added Created 5 years, 5 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 | « content/renderer/pepper/pepper_websocket_host.cc ('k') | net/base/host_port_pair.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #include "gpu/GLES2/gl2extchromium.h" 118 #include "gpu/GLES2/gl2extchromium.h"
119 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 119 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
120 #include "ipc/ipc_channel_handle.h" 120 #include "ipc/ipc_channel_handle.h"
121 #include "ipc/ipc_platform_file.h" 121 #include "ipc/ipc_platform_file.h"
122 #include "ipc/mojo/ipc_channel_mojo.h" 122 #include "ipc/mojo/ipc_channel_mojo.h"
123 #include "media/base/audio_hardware_config.h" 123 #include "media/base/audio_hardware_config.h"
124 #include "media/base/media.h" 124 #include "media/base/media.h"
125 #include "media/renderers/gpu_video_accelerator_factories.h" 125 #include "media/renderers/gpu_video_accelerator_factories.h"
126 #include "mojo/common/common_type_converters.h" 126 #include "mojo/common/common_type_converters.h"
127 #include "net/base/net_errors.h" 127 #include "net/base/net_errors.h"
128 #include "net/base/net_util.h" 128 #include "net/base/port_util.h"
129 #include "skia/ext/event_tracer_impl.h" 129 #include "skia/ext/event_tracer_impl.h"
130 #include "third_party/WebKit/public/platform/WebString.h" 130 #include "third_party/WebKit/public/platform/WebString.h"
131 #include "third_party/WebKit/public/platform/WebThread.h" 131 #include "third_party/WebKit/public/platform/WebThread.h"
132 #include "third_party/WebKit/public/web/WebCache.h" 132 #include "third_party/WebKit/public/web/WebCache.h"
133 #include "third_party/WebKit/public/web/WebColorName.h" 133 #include "third_party/WebKit/public/web/WebColorName.h"
134 #include "third_party/WebKit/public/web/WebDatabase.h" 134 #include "third_party/WebKit/public/web/WebDatabase.h"
135 #include "third_party/WebKit/public/web/WebDocument.h" 135 #include "third_party/WebKit/public/web/WebDocument.h"
136 #include "third_party/WebKit/public/web/WebFrame.h" 136 #include "third_party/WebKit/public/web/WebFrame.h"
137 #include "third_party/WebKit/public/web/WebImageCache.h" 137 #include "third_party/WebKit/public/web/WebImageCache.h"
138 #include "third_party/WebKit/public/web/WebKit.h" 138 #include "third_party/WebKit/public/web/WebKit.h"
(...skipping 1894 matching lines...) Expand 10 before | Expand all | Expand 10 after
2033 } 2033 }
2034 2034
2035 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2035 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2036 size_t erased = 2036 size_t erased =
2037 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2037 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2038 routing_id_); 2038 routing_id_);
2039 DCHECK_EQ(1u, erased); 2039 DCHECK_EQ(1u, erased);
2040 } 2040 }
2041 2041
2042 } // namespace content 2042 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_websocket_host.cc ('k') | net/base/host_port_pair.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698