Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / android / web_contents_observer_android.h

diff --git a/src/content/browser/android/web_contents_observer_android.h b/src/content/browser/android/web_contents_observer_android.h
index 09b98b6..4292903 100644 (file)
--- a/src/content/browser/android/web_contents_observer_android.h
+++ b/src/content/browser/android/web_contents_observer_android.h
@@ -33,55 +33,43 @@ class WebContentsObserverAndroid : public WebContentsObserver {
 
  private:
   virtual void RenderProcessGone(
-      base::TerminationStatus termination_status) OVERRIDE;
-  virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE;
+      base::TerminationStatus termination_status) override;
+  virtual void DidStartLoading(RenderViewHost* render_view_host) override;
+  virtual void DidStopLoading(RenderViewHost* render_view_host) override;
   virtual void DidFailProvisionalLoad(
-      int64 frame_id,
-      const base::string16& frame_unique_name,
-      bool is_main_frame,
+      RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
-      const base::string16& error_description,
-      RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidFailLoad(int64 frame_id,
+      const base::string16& error_description) override;
+  virtual void DidFailLoad(RenderFrameHost* render_frame_host,
                            const GURL& validated_url,
-                           bool is_main_frame,
                            int error_code,
-                           const base::string16& error_description,
-                           RenderViewHost* render_view_host) OVERRIDE;
+                           const base::string16& error_description) override;
   virtual void DidNavigateMainFrame(const LoadCommittedDetails& details,
-                                    const FrameNavigateParams& params) OVERRIDE;
-  virtual void DidNavigateAnyFrame(const LoadCommittedDetails& details,
-                                   const FrameNavigateParams& params) OVERRIDE;
-  virtual void DidFirstVisuallyNonEmptyPaint() OVERRIDE;
+                                    const FrameNavigateParams& params) override;
+  virtual void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
+                                   const LoadCommittedDetails& details,
+                                   const FrameNavigateParams& params) override;
+  virtual void DidFirstVisuallyNonEmptyPaint() override;
   virtual void DidStartProvisionalLoadForFrame(
-      int64 frame_id,
-      int64 parent_frame_id,
-      bool is_main_frame,
+      RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       bool is_error_page,
-      bool is_iframe_srcdoc,
-      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,
+      RenderFrameHost* render_frame_host,
       const GURL& url,
-      PageTransition transition_type,
-      RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidFinishLoad(int64 frame_id,
-                             const GURL& validated_url,
-                             bool is_main_frame,
-                             RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DocumentLoadedInFrame(int64 frame_id,
-                                     RenderViewHost* render_view_host) OVERRIDE;
+      ui::PageTransition transition_type) override;
+  virtual void DidFinishLoad(RenderFrameHost* render_frame_host,
+                             const GURL& validated_url) override;
+  virtual void DocumentLoadedInFrame(
+      RenderFrameHost* render_frame_host) override;
   virtual void NavigationEntryCommitted(
-      const LoadCommittedDetails& load_details) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
-  virtual void DidAttachInterstitialPage() OVERRIDE;
-  virtual void DidDetachInterstitialPage() OVERRIDE;
-  virtual void DidChangeBrandColor(SkColor color) OVERRIDE;
+      const LoadCommittedDetails& load_details) override;
+  virtual void WebContentsDestroyed() override;
+  virtual void DidAttachInterstitialPage() override;
+  virtual void DidDetachInterstitialPage() override;
+  virtual void DidChangeThemeColor(SkColor color) override;
 
   void DidFailLoadInternal(bool is_provisional_load,
                            bool is_main_frame,