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 056b81e19f1a1bb1f8f3a374a38ad35256e744d4..bac1b99e6ae1f86b5a336fb8ff7c9132d4df31b5 100644 |
--- a/chrome/browser/guest_view/guest_view_manager.h |
+++ b/chrome/browser/guest_view/guest_view_manager.h |
@@ -29,6 +29,10 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate, |
static GuestViewManager* FromBrowserContext(content::BrowserContext* context); |
+ void AddGuest(int guest_instance_id, |
lazyboy
2014/05/02 19:52:52
Description for added public methods.
Fady Samuel
2014/05/06 20:02:48
Moved to private. These need to be accessed by Gue
|
+ content::WebContents* guest_web_contents); |
+ void RemoveGuest(int guest_instance_id); |
+ |
content::WebContents* GetGuestByInstanceIDSafely( |
int guest_instance_id, |
int embedder_render_process_id); |
@@ -39,16 +43,16 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate, |
int guest_instance_id); |
// BrowserPluginGuestManagerDelegate implementation. |
+ virtual content::WebContents* CreateGuest( |
+ content::SiteInstance* embedder_site_instance, |
+ int instance_id, |
+ const content::StorageInfo& storage_info, |
+ scoped_ptr<base::DictionaryValue> extra_params) OVERRIDE; |
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 void MaybeGetGuestByInstanceIDOrKill( |
int guest_instance_id, |
int embedder_render_process_id, |
const GuestByInstanceIDCallback& callback) OVERRIDE; |
- virtual content::SiteInstance* GetGuestSiteInstance( |
- const GURL& guest_site) OVERRIDE; |
virtual bool ForEachGuest(content::WebContents* embedder_web_contents, |
const GuestCallback& callback) OVERRIDE; |
@@ -61,6 +65,9 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate, |
int guest_instance_id, |
int embedder_render_process_id); |
+ content::SiteInstance* GetGuestSiteInstance( |
+ const GURL& guest_site); |
+ |
static bool CanEmbedderAccessGuest(int embedder_render_process_id, |
GuestViewBase* guest); |