Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prerender / prerender_tab_helper.h

diff --git a/src/chrome/browser/prerender/prerender_tab_helper.h b/src/chrome/browser/prerender/prerender_tab_helper.h
index 260091d..32e43ff 100644 (file)
--- a/src/chrome/browser/prerender/prerender_tab_helper.h
+++ b/src/chrome/browser/prerender/prerender_tab_helper.h
@@ -51,9 +51,9 @@ class PrerenderTabHelper
   virtual ~PrerenderTabHelper();
 
   // content::WebContentsObserver implementation.
-  virtual void ProvisionalChangeToMainFrameUrl(
-      const GURL& url,
-      content::RenderFrameHost* render_frame_host) OVERRIDE;
+  virtual void DidGetRedirectForResourceRequest(
+      content::RenderViewHost* render_view_host,
+      const content::ResourceRedirectDetails& details) OVERRIDE;
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
@@ -64,7 +64,11 @@ class PrerenderTabHelper
   virtual void DidCommitProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
-      content::PageTransition transition_type) OVERRIDE;
+      ui::PageTransition transition_type) OVERRIDE;
+
+  // Called when the URL of the main frame changed, either when the load
+  // commits, or a redirect happens.
+  void MainFrameUrlDidChange(const GURL& url);
 
   // Called when a password form has been submitted.
   void PasswordSubmitted(const autofill::PasswordForm& form);