| 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 e1da849e8c559f1e8687f58fd01f46d010edebf5..b5dae6dc5edd72bd044a48f2a0fd583e58a6f93b 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_guest.h
|
| +++ b/content/browser/browser_plugin/browser_plugin_guest.h
|
| @@ -97,7 +97,6 @@ class CONTENT_EXPORT BrowserPluginGuest
|
| public WebContentsDelegate,
|
| public WebContentsObserver {
|
| public:
|
| - typedef base::Callback<void(bool)> GeolocationCallback;
|
| virtual ~BrowserPluginGuest();
|
|
|
| // The WebContents passed into the factory method here has not been
|
| @@ -289,14 +288,6 @@ class CONTENT_EXPORT BrowserPluginGuest
|
| BrowserPluginHostMsg_Attach_Params params,
|
| const base::DictionaryValue& extra_params);
|
|
|
| - // Requests geolocation permission through Embedder JavaScript API.
|
| - void AskEmbedderForGeolocationPermission(int bridge_id,
|
| - const GURL& requesting_frame,
|
| - bool user_gesture,
|
| - const GeolocationCallback& callback);
|
| - // Cancels pending geolocation request.
|
| - void CancelGeolocationRequest(int bridge_id);
|
| -
|
| // Returns whether BrowserPluginGuest is interested in receiving the given
|
| // |message|.
|
| static bool ShouldForwardToBrowserPluginGuest(const IPC::Message& message);
|
| @@ -328,7 +319,6 @@ class CONTENT_EXPORT BrowserPluginGuest
|
| friend class TestBrowserPluginGuest;
|
|
|
| class DownloadRequest;
|
| - class GeolocationRequest;
|
| class JavaScriptDialogRequest;
|
| // MediaRequest because of naming conflicts with MediaStreamRequest.
|
| class MediaRequest;
|
| @@ -366,13 +356,8 @@ class CONTENT_EXPORT BrowserPluginGuest
|
| PageTransition transition_type,
|
| WebContents* web_contents);
|
|
|
| - // Bridge IDs correspond to a geolocation request. This method will remove
|
| - // the bookkeeping for a particular geolocation request associated with the
|
| - // provided |bridge_id|. It returns the request ID of the geolocation request.
|
| - int RemoveBridgeID(int bridge_id);
|
| -
|
| // Returns the |request_id| generated for the |request| provided.
|
| - int RequestPermission(
|
| + void RequestPermission(
|
| BrowserPluginPermissionType permission_type,
|
| scoped_refptr<BrowserPluginGuest::PermissionRequest> request,
|
| const base::DictionaryValue& request_info);
|
| @@ -527,10 +512,6 @@ class CONTENT_EXPORT BrowserPluginGuest
|
| const base::Callback<void(bool)>& callback,
|
| const std::string& url);
|
|
|
| - // Embedder sets permission to allow or deny geolocation request.
|
| - void SetGeolocationPermission(
|
| - GeolocationCallback callback, int bridge_id, bool allowed);
|
| -
|
| // Forwards all messages from the |pending_messages_| queue to the embedder.
|
| void SendQueuedMessages();
|
|
|
| @@ -540,8 +521,6 @@ class CONTENT_EXPORT BrowserPluginGuest
|
| scoped_ptr<EmbedderWebContentsObserver> embedder_web_contents_observer_;
|
| WebContentsImpl* embedder_web_contents_;
|
|
|
| - 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_;
|
|
|