content/browser/tab_contents/tab_contents.h - Issue 6319001: Support window.opener after a process swap.

Unified Diff: content/browser/tab_contents/tab_contents.h

Issue 6319001: Support window.opener after a process swap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add WasSwappedOut message for clean exit. Created 9 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

« content/browser/renderer_host/render_widget_host.cc ('K') | « content/browser/tab_contents/render_view_host_manager_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/tab_contents.h

diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h

index 17992dc2d2e3f1fc87ed0917a24fd745aaae0774..47646b5b1a2bbdf7daa8028b6fd5f4710a404de4 100644

--- a/content/browser/tab_contents/tab_contents.h

+++ b/content/browser/tab_contents/tab_contents.h

@@ -649,25 +649,6 @@ class TabContents : public PageNavigator,

void AddObservers();

// Message handlers.

- void OnDidStartProvisionalLoadForFrame(int64 frame_id,

- bool main_frame,

- const GURL& url);

- void OnDidRedirectProvisionalLoad(int32 page_id,

- const GURL& source_url,

- const GURL& target_url);

- void OnDidFailProvisionalLoadWithError(int64 frame_id,

- bool main_frame,

- int error_code,

- const GURL& url,

- bool showing_repost_interstitial);

- void OnDidLoadResourceFromMemoryCache(const GURL& url,

- const std::string& security_info);

- void OnDidDisplayInsecureContent();

- void OnDidRunInsecureContent(const std::string& security_origin,

- const GURL& target_url);

- void OnDocumentLoadedInFrame(int64 frame_id);

- void OnDidFinishLoad(int64 frame_id);

- void OnUpdateContentRestrictions(int restrictions);

void OnPDFHasUnsupportedFeature();

void OnGoToEntryAtOffset(int offset);

@@ -800,6 +781,27 @@ class TabContents : public PageNavigator,

virtual void DidStartLoading();

virtual void DidStopLoading();

virtual void DidChangeLoadProgress(double progress);

+ virtual void DidStartProvisionalLoadForFrame(int64 frame_id,

+ bool main_frame,

+ const GURL& url);

+ virtual void DidRedirectProvisionalLoad(int32 page_id,

+ const GURL& source_url,

+ const GURL& target_url);

+ virtual void DidFailProvisionalLoadWithError(

+ int64 frame_id,

+ bool main_frame,

+ int error_code,

+ const GURL& url,

+ bool showing_repost_interstitial);

+ virtual void DidLoadResourceFromMemoryCache(

+ const GURL& url,

+ const std::string& security_info);

+ virtual void DidDisplayInsecureContent();

+ virtual void DidRunInsecureContent(const std::string& security_origin,

+ const GURL& target_url);

+ virtual void DocumentLoadedInFrame(int64 frame_id);

+ virtual void DidFinishLoad(int64 frame_id);

+ virtual void UpdateContentRestrictions(int restrictions);

virtual void DocumentOnLoadCompletedInMainFrame(

RenderViewHost* render_view_host,

int32 page_id);

@@ -812,13 +814,15 @@ class TabContents : public PageNavigator,

virtual void ProcessExternalHostMessage(const std::string& message,

const std::string& origin,

const std::string& target);

- virtual void RunJavaScriptMessage(const std::wstring& message,

+ virtual void RunJavaScriptMessage(const RenderViewHost* rvh,

+ const std::wstring& message,

const std::wstring& default_prompt,

const GURL& frame_url,

const int flags,

IPC::Message* reply_msg,

bool* did_suppress_message);

- virtual void RunBeforeUnloadConfirm(const std::wstring& message,

+ virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh,

+ const std::wstring& message,

IPC::Message* reply_msg);

virtual GURL GetAlternateErrorPageURL() const;

virtual RendererPreferences GetRendererPrefs(Profile* profile) const;