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

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

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 years, 7 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') | media/base/android/media_player_bridge.h » ('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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 #include "content/renderer/android/address_detector.h" 217 #include "content/renderer/android/address_detector.h"
218 #include "content/renderer/android/content_detector.h" 218 #include "content/renderer/android/content_detector.h"
219 #include "content/renderer/android/email_detector.h" 219 #include "content/renderer/android/email_detector.h"
220 #include "content/renderer/android/phone_number_detector.h" 220 #include "content/renderer/android/phone_number_detector.h"
221 #include "content/renderer/media/stream_texture_factory_impl_android.h" 221 #include "content/renderer/media/stream_texture_factory_impl_android.h"
222 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" 222 #include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
223 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" 223 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
224 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" 224 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
225 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" 225 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
226 #include "ui/gfx/rect_f.h" 226 #include "ui/gfx/rect_f.h"
227 #include "webkit/media/android/media_player_bridge_manager_impl.h"
228 #include "webkit/media/android/webmediaplayer_android.h" 227 #include "webkit/media/android/webmediaplayer_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)
237 #include "skia/ext/skia_utils_mac.h" 236 #include "skia/ext/skia_utils_mac.h"
(...skipping 6284 matching lines...) Expand 10 before | Expand all | Expand 10 after
6522 WebURL url = icon_urls[i].iconURL(); 6521 WebURL url = icon_urls[i].iconURL();
6523 if (!url.isEmpty()) 6522 if (!url.isEmpty())
6524 urls.push_back(FaviconURL(url, 6523 urls.push_back(FaviconURL(url,
6525 ToFaviconType(icon_urls[i].iconType()))); 6524 ToFaviconType(icon_urls[i].iconType())));
6526 } 6525 }
6527 SendUpdateFaviconURL(urls); 6526 SendUpdateFaviconURL(urls);
6528 } 6527 }
6529 6528
6530 6529
6531 } // namespace content 6530 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698