chrome/browser/geolocation/chrome_geolocation_permission_context.cc - Issue 107413006: Dismiss EME infobar when WebMediaPlayer is destroyed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Issue 107413006: Dismiss EME infobar when WebMediaPlayer is destroyed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: #if defined(OS_ANDROID) Created 6 years, 12 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/permission_request_id.h ('K') | « chrome/browser/content_settings/permission_request_id.cc ('k') | chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc » ('j') | content/browser/media/android/browser_media_player_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc

diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc

index 6f6d9b66a080f221a417017d8995e6b026c683c0..4c0cdf5d6f69cbe8dc5b192d1fad90eb37f6bdae 100644

--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc

+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc

@@ -62,8 +62,7 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission(

content::WebContents* web_contents =

tab_util::GetWebContentsByID(render_process_id, render_view_id);

- const PermissionRequestID id(render_process_id, render_view_id,

- bridge_id);

+ const PermissionRequestID id(render_process_id, render_view_id, bridge_id, 0);

ExtensionService* extension_service =

extensions::ExtensionSystem::Get(profile_)->extension_service();

if (extension_service) {

@@ -113,7 +112,7 @@ void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(

int bridge_id,

const GURL& requesting_frame) {

CancelPendingInfoBarRequest(PermissionRequestID(

- render_process_id, render_view_id, bridge_id));

+ render_process_id, render_view_id, bridge_id, 0));

}

void ChromeGeolocationPermissionContext::DecidePermission(