| OLD | NEW |
| 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 #include "content/renderer/android/address_detector.h" | 216 #include "content/renderer/android/address_detector.h" |
| 217 #include "content/renderer/android/content_detector.h" | 217 #include "content/renderer/android/content_detector.h" |
| 218 #include "content/renderer/android/email_detector.h" | 218 #include "content/renderer/android/email_detector.h" |
| 219 #include "content/renderer/android/phone_number_detector.h" | 219 #include "content/renderer/android/phone_number_detector.h" |
| 220 #include "content/renderer/media/stream_texture_factory_impl_android.h" | 220 #include "content/renderer/media/stream_texture_factory_impl_android.h" |
| 221 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" | 221 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" |
| 222 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" | 222 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" |
| 223 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" | 223 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" |
| 224 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" | 224 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" |
| 225 #include "ui/gfx/rect_f.h" | 225 #include "ui/gfx/rect_f.h" |
| 226 #include "webkit/media/android/media_player_bridge_manager_impl.h" | |
| 227 #include "webkit/media/android/webmediaplayer_android.h" | 226 #include "webkit/media/android/webmediaplayer_android.h" |
| 228 #include "webkit/media/android/webmediaplayer_impl_android.h" | 227 #include "webkit/media/android/webmediaplayer_impl_android.h" |
| 229 #include "webkit/media/android/webmediaplayer_manager_android.h" | 228 #include "webkit/media/android/webmediaplayer_manager_android.h" |
| 230 #elif defined(OS_WIN) | 229 #elif defined(OS_WIN) |
| 231 // TODO(port): these files are currently Windows only because they concern: | 230 // TODO(port): these files are currently Windows only because they concern: |
| 232 // * theming | 231 // * theming |
| 233 #include "ui/native_theme/native_theme_win.h" | 232 #include "ui/native_theme/native_theme_win.h" |
| 234 #elif defined(USE_X11) | 233 #elif defined(USE_X11) |
| 235 #include "ui/native_theme/native_theme.h" | 234 #include "ui/native_theme/native_theme.h" |
| 236 #elif defined(OS_MACOSX) | 235 #elif defined(OS_MACOSX) |
| (...skipping 6266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6503 WebURL url = icon_urls[i].iconURL(); | 6502 WebURL url = icon_urls[i].iconURL(); |
| 6504 if (!url.isEmpty()) | 6503 if (!url.isEmpty()) |
| 6505 urls.push_back(FaviconURL(url, | 6504 urls.push_back(FaviconURL(url, |
| 6506 ToFaviconType(icon_urls[i].iconType()))); | 6505 ToFaviconType(icon_urls[i].iconType()))); |
| 6507 } | 6506 } |
| 6508 SendUpdateFaviconURL(urls); | 6507 SendUpdateFaviconURL(urls); |
| 6509 } | 6508 } |
| 6510 | 6509 |
| 6511 | 6510 |
| 6512 } // namespace content | 6511 } // namespace content |
| OLD | NEW |