| Index: chrome/browser/guest_view/web_view/web_view_guest.h
|
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.h b/chrome/browser/guest_view/web_view/web_view_guest.h
|
| index 4ca9036a67a66c02005554b7a6a83712104a1414..0e2416e25799086d81527f5ef2de7014986ca29a 100644
|
| --- a/chrome/browser/guest_view/web_view/web_view_guest.h
|
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.h
|
| @@ -44,9 +44,7 @@ class SimpleMenuModel;
|
| class WebViewGuest : public GuestView<WebViewGuest>,
|
| public content::NotificationObserver {
|
| public:
|
| - WebViewGuest(int guest_instance_id,
|
| - content::WebContents* guest_web_contents,
|
| - const std::string& embedder_extension_id);
|
| + explicit WebViewGuest(int guest_instance_id);
|
|
|
| // For WebViewGuest, we create special guest processes, which host the
|
| // tag content separately from the main application that embeds the tag.
|
| @@ -63,12 +61,7 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
| // Returns guestview::kInstanceIDNone if |contents| does not correspond to a
|
| // WebViewGuest.
|
| static int GetViewInstanceId(content::WebContents* contents);
|
| - // Parses partition related parameters from |extra_params|.
|
| - // |storage_partition_id| is the parsed partition ID and |persist_storage|
|
| - // specifies whether or not the partition is in memory.
|
| - static void ParsePartitionParam(const base::DictionaryValue* extra_params,
|
| - std::string* storage_partition_id,
|
| - bool* persist_storage);
|
| +
|
| static const char Type[];
|
|
|
| // Request navigating the guest to the provided |src| URL.
|
| @@ -88,11 +81,17 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
| void SetZoom(double zoom_factor);
|
|
|
| // GuestViewBase implementation.
|
| + virtual void CreateWebContents(
|
| + const std::string& embedder_extension_id,
|
| + content::RenderProcessHost* embedder_render_process_host,
|
| + const base::DictionaryValue& create_params,
|
| + const WebContentsCallback& callback) OVERRIDE;
|
| virtual void DidAttach() OVERRIDE;
|
| virtual void DidStopLoading() OVERRIDE;
|
| virtual void EmbedderDestroyed() OVERRIDE;
|
| virtual void GuestDestroyed() OVERRIDE;
|
| virtual bool IsDragAndDropEnabled() const OVERRIDE;
|
| + virtual void Init() OVERRIDE;
|
| virtual void WillDestroy() OVERRIDE;
|
|
|
| // WebContentsDelegate implementation.
|
| @@ -150,6 +149,8 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
| content::WebContents* new_contents) OVERRIDE;
|
|
|
| // BrowserPluginGuestDelegate implementation.
|
| + virtual content::WebContents* CreateNewGuestWindow(
|
| + content::WebContents::CreateParams* create_params) OVERRIDE;
|
| virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size)
|
| OVERRIDE;
|
| virtual void RequestPointerLockPermission(
|
| @@ -429,7 +430,8 @@ class WebViewGuest : public GuestView<WebViewGuest>,
|
| void OnUpdateFrameName(bool is_top_level, const std::string& name);
|
|
|
| // Creates a new guest window owned by this WebViewGuest.
|
| - WebViewGuest* CreateNewGuestWindow(const content::OpenURLParams& params);
|
| + WebViewGuest* CreateNewGuestWebViewWindow(
|
| + const content::OpenURLParams& params);
|
|
|
| bool HandleKeyboardShortcuts(const content::NativeWebKeyboardEvent& event);
|
|
|
|
|