Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / net / net_error_tab_helper.h

diff --git a/src/chrome/browser/net/net_error_tab_helper.h b/src/chrome/browser/net/net_error_tab_helper.h
index e9e1fc6..195c8fa 100644 (file)
--- a/src/chrome/browser/net/net_error_tab_helper.h
+++ b/src/chrome/browser/net/net_error_tab_helper.h
@@ -46,31 +46,26 @@ class NetErrorTabHelper
   }
 
   // content::WebContentsObserver implementation.
+  virtual void DidStartNavigationToPendingEntry(
+      const GURL& url,
+      content::NavigationController::ReloadType reload_type) OVERRIDE;
+
   virtual void DidStartProvisionalLoadForFrame(
-      int64 frame_id,
-      int64 parent_frame_id,
-      bool is_main_frame,
+      content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       bool is_error_page,
-      bool is_iframe_srcdoc,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      bool is_iframe_srcdoc) OVERRIDE;
 
   virtual void DidCommitProvisionalLoadForFrame(
-      int64 frame_id,
-      const string16& frame_unique_name,
-      bool is_main_frame,
+      content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      content::PageTransition transition_type,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::PageTransition transition_type) OVERRIDE;
 
   virtual void DidFailProvisionalLoad(
-      int64 frame_id,
-      const string16& frame_unique_name,
-      bool is_main_frame,
+      content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
-      const string16& error_description,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      const base::string16& error_description) OVERRIDE;
 
  protected:
   // |contents| is the WebContents of the tab this NetErrorTabHelper is
@@ -110,9 +105,6 @@ class NetErrorTabHelper
   // navigations), it re-sends the status whenever an error page commits.
   chrome_common_net::DnsProbeStatus dns_probe_status_;
 
-  // Whether probes are enabled (by the command-line option or the field trial).
-  const bool probes_enabled_;
-
   // Optional callback for browser test to snoop on outgoing NetErrorInfo IPCs.
   DnsProbeStatusSnoopCallback dns_probe_status_snoop_callback_;