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

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

Issue 16232014: Revert 203261 "split webkit/glue/webpreferences to common and re..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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
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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 #include "webkit/glue/webkit_glue.h" 205 #include "webkit/glue/webkit_glue.h"
206 #include "webkit/glue/weburlresponse_extradata_impl.h" 206 #include "webkit/glue/weburlresponse_extradata_impl.h"
207 #include "webkit/plugins/npapi/plugin_list.h" 207 #include "webkit/plugins/npapi/plugin_list.h"
208 #include "webkit/plugins/npapi/plugin_utils.h" 208 #include "webkit/plugins/npapi/plugin_utils.h"
209 #include "webkit/plugins/npapi/webplugin_delegate.h" 209 #include "webkit/plugins/npapi/webplugin_delegate.h"
210 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" 210 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
211 #include "webkit/plugins/npapi/webplugin_impl.h" 211 #include "webkit/plugins/npapi/webplugin_impl.h"
212 #include "webkit/renderer/media/webmediaplayer_impl.h" 212 #include "webkit/renderer/media/webmediaplayer_impl.h"
213 #include "webkit/renderer/media/webmediaplayer_ms.h" 213 #include "webkit/renderer/media/webmediaplayer_ms.h"
214 #include "webkit/renderer/media/webmediaplayer_params.h" 214 #include "webkit/renderer/media/webmediaplayer_params.h"
215 #include "webkit/renderer/webpreferences_renderer.h"
216 215
217 #if defined(OS_ANDROID) 216 #if defined(OS_ANDROID)
218 #include <cpu-features.h> 217 #include <cpu-features.h>
219 218
220 #include "content/common/android/device_telephony_info.h" 219 #include "content/common/android/device_telephony_info.h"
221 #include "content/common/gpu/client/context_provider_command_buffer.h" 220 #include "content/common/gpu/client/context_provider_command_buffer.h"
222 #include "content/renderer/android/address_detector.h" 221 #include "content/renderer/android/address_detector.h"
223 #include "content/renderer/android/content_detector.h" 222 #include "content/renderer/android/content_detector.h"
224 #include "content/renderer/android/email_detector.h" 223 #include "content/renderer/android/email_detector.h"
225 #include "content/renderer/android/phone_number_detector.h" 224 #include "content/renderer/android/phone_number_detector.h"
(...skipping 6347 matching lines...) Expand 10 before | Expand all | Expand 10 after
6573 WebURL url = icon_urls[i].iconURL(); 6572 WebURL url = icon_urls[i].iconURL();
6574 if (!url.isEmpty()) 6573 if (!url.isEmpty())
6575 urls.push_back(FaviconURL(url, 6574 urls.push_back(FaviconURL(url,
6576 ToFaviconType(icon_urls[i].iconType()))); 6575 ToFaviconType(icon_urls[i].iconType())));
6577 } 6576 }
6578 SendUpdateFaviconURL(urls); 6577 SendUpdateFaviconURL(urls);
6579 } 6578 }
6580 6579
6581 6580
6582 } // namespace content 6581 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/render_view_impl.h ('k') | trunk/src/content/shell/common/webkit_test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698