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

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

Issue 394403002: Move weburlresponse_extradata_impl.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/child/BUILD.gn » ('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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 #include "ui/base/clipboard/clipboard.h" 187 #include "ui/base/clipboard/clipboard.h"
188 #include "ui/base/ui_base_switches_util.h" 188 #include "ui/base/ui_base_switches_util.h"
189 #include "ui/events/latency_info.h" 189 #include "ui/events/latency_info.h"
190 #include "ui/gfx/native_widget_types.h" 190 #include "ui/gfx/native_widget_types.h"
191 #include "ui/gfx/point.h" 191 #include "ui/gfx/point.h"
192 #include "ui/gfx/rect.h" 192 #include "ui/gfx/rect.h"
193 #include "ui/gfx/rect_conversions.h" 193 #include "ui/gfx/rect_conversions.h"
194 #include "ui/gfx/size_conversions.h" 194 #include "ui/gfx/size_conversions.h"
195 #include "ui/shell_dialogs/selected_file_info.h" 195 #include "ui/shell_dialogs/selected_file_info.h"
196 #include "v8/include/v8.h" 196 #include "v8/include/v8.h"
197 #include "webkit/child/weburlresponse_extradata_impl.h"
198 197
199 #if defined(OS_ANDROID) 198 #if defined(OS_ANDROID)
200 #include <cpu-features.h> 199 #include <cpu-features.h>
201 200
202 #include "content/renderer/android/address_detector.h" 201 #include "content/renderer/android/address_detector.h"
203 #include "content/renderer/android/content_detector.h" 202 #include "content/renderer/android/content_detector.h"
204 #include "content/renderer/android/email_detector.h" 203 #include "content/renderer/android/email_detector.h"
205 #include "content/renderer/android/phone_number_detector.h" 204 #include "content/renderer/android/phone_number_detector.h"
206 #include "net/android/network_library.h" 205 #include "net/android/network_library.h"
207 #include "skia/ext/platform_canvas.h" 206 #include "skia/ext/platform_canvas.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 using blink::WebURLResponse; 301 using blink::WebURLResponse;
303 using blink::WebUserGestureIndicator; 302 using blink::WebUserGestureIndicator;
304 using blink::WebVector; 303 using blink::WebVector;
305 using blink::WebView; 304 using blink::WebView;
306 using blink::WebWidget; 305 using blink::WebWidget;
307 using blink::WebWindowFeatures; 306 using blink::WebWindowFeatures;
308 using blink::WebNetworkStateNotifier; 307 using blink::WebNetworkStateNotifier;
309 using blink::WebRuntimeFeatures; 308 using blink::WebRuntimeFeatures;
310 using base::Time; 309 using base::Time;
311 using base::TimeDelta; 310 using base::TimeDelta;
312 using webkit_glue::WebURLResponseExtraDataImpl;
313 311
314 #if defined(OS_ANDROID) 312 #if defined(OS_ANDROID)
315 using blink::WebContentDetectionResult; 313 using blink::WebContentDetectionResult;
316 using blink::WebFloatPoint; 314 using blink::WebFloatPoint;
317 using blink::WebFloatRect; 315 using blink::WebFloatRect;
318 using blink::WebHitTestResult; 316 using blink::WebHitTestResult;
319 #endif 317 #endif
320 318
321 namespace content { 319 namespace content {
322 320
(...skipping 3979 matching lines...) Expand 10 before | Expand all | Expand 10 after
4302 std::vector<gfx::Size> sizes; 4300 std::vector<gfx::Size> sizes;
4303 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4301 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4304 if (!url.isEmpty()) 4302 if (!url.isEmpty())
4305 urls.push_back( 4303 urls.push_back(
4306 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4304 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4307 } 4305 }
4308 SendUpdateFaviconURL(urls); 4306 SendUpdateFaviconURL(urls);
4309 } 4307 }
4310 4308
4311 } // namespace content 4309 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698