content/browser/browser_plugin/browser_plugin_guest.h - Issue 13712002: Fix Guest geolocation API, we were using |bridge_id| and |request_id| interchangeably which is wron…

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: content/browser/browser_plugin/browser_plugin_guest.h

Issue 13712002: Fix Guest geolocation API, we were using |bridge_id| and |request_id| interchangeably which is wron… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sync. Created 7 years, 8 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

« no previous file with comments | « content/browser/browser_plugin/browser_plugin_geolocation_permission_context.cc ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_plugin/browser_plugin_guest.h

diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h

index 5df45b493e683915e8a4936074d7d5f6c81ac5f4..2bbf2f22185988d2548c2a06a7f08f23bf57ef04 100644

--- a/content/browser/browser_plugin/browser_plugin_guest.h

+++ b/content/browser/browser_plugin/browser_plugin_guest.h

@@ -404,8 +404,13 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,

NotificationRegistrar notification_registrar_;

scoped_ptr<EmbedderRenderViewHostObserver> embedder_rvh_observer_;

WebContentsImpl* embedder_web_contents_;

- typedef std::map<int, GeolocationCallback> GeolocationRequestsMap;

- GeolocationRequestsMap geolocation_request_callback_map_;

+ // GeolocationRequestItem contains callback and bridge id for a request.

+ typedef std::pair<GeolocationCallback, int> GeolocationRequestItem;

+ typedef std::map<int, GeolocationRequestItem> GeolocationRequestsMap;

+ GeolocationRequestsMap geolocation_request_map_;

+ std::map<int, int> bridge_id_to_request_id_map_;

// An identifier that uniquely identifies a browser plugin guest within an

// embedder.

int instance_id_;