Do not reset navigation state when BeforeUnload is cancelled by a commit

content/shell/browser/shell_javascript_dialog_manager.h

Index: content/shell/browser/shell_javascript_dialog_manager.h
diff --git a/content/shell/browser/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h
index 42311042374f6ec14fadc8ee523650c5096a201f..e7138c6bcefe36cc9bdd88b5df6bb4494f3bfdb4 100644
--- a/content/shell/browser/shell_javascript_dialog_manager.h
+++ b/content/shell/browser/shell_javascript_dialog_manager.h
@@ -46,6 +46,9 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager {
   void set_dialog_request_callback(const base::Closure& callback) {
     dialog_request_callback_ = callback;
   }
+  void set_proceed_beforeunload_default(bool proceed) {
+    proceed_beforeunload_default_ = proceed;
+  }
 
  private:
 #if defined(OS_MACOSX) || defined(OS_WIN)
@@ -56,6 +59,8 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager {
 #endif
 
   base::Closure dialog_request_callback_;
+  bool proceed_beforeunload_default_;

[Charlie Reis, 2016/03/29 18:33:21]

nit: should_proceed_on_beforeunload_?  (The current name is a bit hard to
parse.)

A comment here would also help.

[clamy, 2016/03/30 13:31:11]

Done.

+  DialogClosedCallback before_unload_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager);
 };