Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / captive_portal / captive_portal_tab_helper.h

diff --git a/src/chrome/browser/captive_portal/captive_portal_tab_helper.h b/src/chrome/browser/captive_portal/captive_portal_tab_helper.h
index c2abe57..99508a6 100644 (file)
--- a/src/chrome/browser/captive_portal/captive_portal_tab_helper.h
+++ b/src/chrome/browser/captive_portal/captive_portal_tab_helper.h
@@ -14,7 +14,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "webkit/common/resource_type.h"
+#include "content/public/common/resource_type.h"
 
 class GURL;
 class Profile;
@@ -27,8 +27,6 @@ namespace net {
 class SSLInfo;
 }
 
-namespace captive_portal {
-
 class CaptivePortalLoginDetector;
 class CaptivePortalTabReloader;
 
@@ -62,46 +60,33 @@ class CaptivePortalTabHelper
       public base::NonThreadSafe,
       public content::WebContentsUserData<CaptivePortalTabHelper> {
  public:
-  virtual ~CaptivePortalTabHelper();
+  ~CaptivePortalTabHelper() override;
 
   // content::WebContentsObserver:
-  virtual void RenderViewDeleted(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+  void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
 
-  virtual void DidStartProvisionalLoadForFrame(
-      int64 frame_id,
-      int64 parent_frame_id,
-      bool is_main_frame,
+  void DidStartProvisionalLoadForFrame(
+      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 base::string16& frame_unique_name,
-      bool is_main_frame,
+  void DidCommitProvisionalLoadForFrame(
+      content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      content::PageTransition transition_type,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      ui::PageTransition transition_type) override;
 
-  virtual void DidFailProvisionalLoad(
-      int64 frame_id,
-      const base::string16& frame_unique_name,
-      bool is_main_frame,
-      const GURL& validated_url,
-      int error_code,
-      const base::string16& error_description,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+  void DidFailProvisionalLoad(content::RenderFrameHost* render_frame_host,
+                              const GURL& validated_url,
+                              int error_code,
+                              const base::string16& error_description) override;
 
-  virtual void DidStopLoading(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+  void DidStopLoading(content::RenderViewHost* render_view_host) override;
 
   // content::NotificationObserver:
-  virtual void Observe(
-      int type,
-      const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // Called when a certificate interstitial error page is about to be shown.
   void OnSSLCertError(const net::SSLInfo& ssl_info);
@@ -119,11 +104,13 @@ class CaptivePortalTabHelper
 
   // Called by Observe in response to the corresponding event.
   void OnRedirect(int child_id,
-                  ResourceType::Type resource_type,
+                  content::ResourceType resource_type,
                   const GURL& new_url);
 
   // Called by Observe in response to the corresponding event.
-  void OnCaptivePortalResults(Result previous_result, Result result);
+  void OnCaptivePortalResults(
+      captive_portal::CaptivePortalResult previous_result,
+      captive_portal::CaptivePortalResult result);
 
   void OnLoadAborted();
 
@@ -167,6 +154,4 @@ class CaptivePortalTabHelper
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalTabHelper);
 };
 
-}  // namespace captive_portal
-
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_TAB_HELPER_H_