Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / content / browser / web_contents / web_contents_impl.h

diff --git a/src/content/browser/web_contents/web_contents_impl.h b/src/content/browser/web_contents/web_contents_impl.h
index df48e6d..5d48e30 100644 (file)
--- a/src/content/browser/web_contents/web_contents_impl.h
+++ b/src/content/browser/web_contents/web_contents_impl.h
@@ -454,6 +454,8 @@ class CONTENT_EXPORT WebContentsImpl
       bool is_main_frame,
       const GURL& url,
       PageTransition transition_type) OVERRIDE;
+  virtual void DidNavigateMainFramePreCommit(
+      const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;
   virtual void DidNavigateMainFramePostCommit(
       const LoadCommittedDetails& details,
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;
@@ -642,8 +644,11 @@ class CONTENT_EXPORT WebContentsImpl
   // watching |web_contents|. No-op if there is no such observer.
   void RemoveDestructionObserver(WebContentsImpl* web_contents);
 
-  // Callback function when showing JS dialogs.
-  void OnDialogClosed(RenderViewHost* rvh,
+  // Callback function when showing JavaScript dialogs.  Takes in a routing ID
+  // pair to identify the RenderViewHost that opened the dialog, because it's
+  // possible for the RenderViewHost to be deleted by the time this is called.
+  void OnDialogClosed(int render_process_id,
+                      int render_view_id,
                       IPC::Message* reply_msg,
                       bool success,
                       const base::string16& user_input);