Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / supervised_user / supervised_user_navigation_observer.h

diff --git a/src/chrome/browser/supervised_user/supervised_user_navigation_observer.h b/src/chrome/browser/supervised_user/supervised_user_navigation_observer.h
index 6822eeb..0b654c0 100644 (file)
--- a/src/chrome/browser/supervised_user/supervised_user_navigation_observer.h
+++ b/src/chrome/browser/supervised_user/supervised_user_navigation_observer.h
@@ -29,7 +29,7 @@ class SupervisedUserNavigationObserver
     : public content::WebContentsObserver,
       public content::WebContentsUserData<SupervisedUserNavigationObserver> {
  public:
-  virtual ~SupervisedUserNavigationObserver();
+  ~SupervisedUserNavigationObserver() override;
 
   // Sets the specific infobar as dismissed.
   void WarnInfoBarDismissed();
@@ -51,16 +51,10 @@ class SupervisedUserNavigationObserver
   explicit SupervisedUserNavigationObserver(content::WebContents* web_contents);
 
   // content::WebContentsObserver implementation.
-  virtual void ProvisionalChangeToMainFrameUrl(
+  void DidCommitProvisionalLoadForFrame(
+      content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      content::RenderFrameHost* render_frame_host) OVERRIDE;
-  virtual void DidCommitProvisionalLoadForFrame(
-      int64 frame_id,
-      const base::string16& frame_unique_name,
-      bool is_main_frame,
-      const GURL& url,
-      content::PageTransition transition_type,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      ui::PageTransition transition_type) override;
 
   void OnRequestBlockedInternal(const GURL& url);