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

content/shell/browser/shell_javascript_dialog_manager.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
 #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 28 matching lines @@
 
   void ResetDialogState(WebContents* web_contents) override;
 
   // Called by the ShellJavaScriptDialog when it closes.
   void DialogClosed(ShellJavaScriptDialog* dialog);
 
   // Used for content_browsertests.
   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)
   // The dialog being shown. No queueing.
   scoped_ptr<ShellJavaScriptDialog> dialog_;
 #else
   // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
 #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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_