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

Unified Diff: content/browser/media/android/browser_media_player_manager.cc

Issue 52463004: Block media loading when AwSettings.setBlockNetworkLoads is true. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable failed test Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 682ef3f3738aac18124cf1ff6939e3f56683e906..5e8eb33170d8726a49d710b3a6d556038c6a240d 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -11,6 +11,7 @@
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/web_contents/web_contents_view_android.h"
#include "content/common/media/media_player_messages_android.h"
+#include "content/public/browser/android/content_view_core.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
@@ -65,7 +66,13 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer(
case MEDIA_PLAYER_TYPE_URL: {
MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge(
player_id, url, first_party_for_cookies, hide_url_log, manager);
- media_player_bridge->Initialize();
+ BrowserMediaPlayerManager* browser_media_player_manager =
+ static_cast<BrowserMediaPlayerManager*>(manager);
+ ContentViewCoreImpl* content_view_core_impl =
+ static_cast<ContentViewCoreImpl*>(ContentViewCore::FromWebContents(
+ browser_media_player_manager->web_contents_));
+ if (!content_view_core_impl->ShouldBlockMediaRequest(url))
+ media_player_bridge->Initialize();
return media_player_bridge;
}

Powered by Google App Engine
This is Rietveld 408576698