Index: chrome/browser/guest_view/guest_view_manager.h |
diff --git a/chrome/browser/guest_view/guest_view_manager.h b/chrome/browser/guest_view/guest_view_manager.h |
index 0c7382795ef373cad9ac0f24d4c37586d4308759..056b81e19f1a1bb1f8f3a374a38ad35256e744d4 100644 |
--- a/chrome/browser/guest_view/guest_view_manager.h |
+++ b/chrome/browser/guest_view/guest_view_manager.h |
@@ -29,19 +29,24 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate, |
static GuestViewManager* FromBrowserContext(content::BrowserContext* context); |
+ content::WebContents* GetGuestByInstanceIDSafely( |
+ int guest_instance_id, |
+ int embedder_render_process_id); |
+ bool CanEmbedderAccessInstanceIDMaybeKill( |
+ int embedder_render_process_id, |
+ int guest_instance_id); |
+ bool CanEmbedderAccessInstanceID(int embedder_render_process_id, |
lazyboy
2014/05/01 23:27:58
Exposing this publicly defeats the purpose since i
Fady Samuel
2014/05/06 16:51:36
Done.
|
+ int guest_instance_id); |
+ |
// BrowserPluginGuestManagerDelegate implementation. |
virtual int GetNextInstanceID() OVERRIDE; |
virtual void AddGuest(int guest_instance_id, |
content::WebContents* guest_web_contents) OVERRIDE; |
virtual void RemoveGuest(int guest_instance_id) OVERRIDE; |
- virtual content::WebContents* GetGuestByInstanceID( |
+ virtual void MaybeGetGuestByInstanceIDOrKill( |
int guest_instance_id, |
- int embedder_render_process_id) OVERRIDE; |
- virtual bool CanEmbedderAccessInstanceIDMaybeKill( |
int embedder_render_process_id, |
- int guest_instance_id) OVERRIDE; |
- virtual bool CanEmbedderAccessInstanceID(int embedder_render_process_id, |
- int guest_instance_id) OVERRIDE; |
+ const GuestByInstanceIDCallback& callback) OVERRIDE; |
virtual content::SiteInstance* GetGuestSiteInstance( |
const GURL& guest_site) OVERRIDE; |
virtual bool ForEachGuest(content::WebContents* embedder_web_contents, |
@@ -52,6 +57,10 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate, |
void AddRenderProcessHostID(int render_process_host_id); |
+ content::WebContents* GetGuestByInstanceID( |
lazyboy
2014/05/01 23:27:58
Doc, also say when it returns NULL etc.
Fady Samuel
2014/05/06 16:51:36
I documented the public method.
|
+ int guest_instance_id, |
+ int embedder_render_process_id); |
+ |
static bool CanEmbedderAccessGuest(int embedder_render_process_id, |
GuestViewBase* guest); |