Fix the issue introduced by hooking window.onbeforeunload in WebDialogView which breaks WebDialogUI…

ui/views/controls/webview/web_dialog_view.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/controls/webview/web_dialog_view.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 31 matching lines @@
 WebDialogView::WebDialogView(
     content::BrowserContext* context,
     WebDialogDelegate* delegate,
     WebContentsHandler* handler)
     : ClientView(NULL, NULL),
       WebDialogWebContentsDelegate(context, handler),
       initialized_(false),
       delegate_(delegate),
       web_view_(new views::WebView(context)),
       is_attempting_close_dialog_(false),
-      before_unload_fired_(false) {
+      before_unload_fired_(false),
+      closed_via_webui_(false) {
   web_view_->set_allow_accelerators(true);
   AddChildView(web_view_);
   set_contents_view(web_view_);
   SetLayoutManager(new views::FillLayout);
   // Pressing the ESC key will close the dialog.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 WebDialogView::~WebDialogView() {
 }
@@ skipping 155 matching lines @@
 
   if (GetWidget())
     GetWidget()->Close();
 
   if (delegate_) {
     delegate_->OnDialogClosed(json_retval);
     delegate_ = NULL;  // We will not communicate further with the delegate.
   }
 }
 
+void WebDialogView::OnDialogCloseFromWebUI(const std::string& json_retval) {
+  closed_via_webui_ = true;
+  dialog_close_retval_ = json_retval;
+  if (GetWidget())
+    GetWidget()->Close();
+}
+
 void WebDialogView::OnCloseContents(WebContents* source,
                                     bool* out_close_dialog) {
   if (delegate_)
     delegate_->OnCloseContents(source, out_close_dialog);
 }
 
 bool WebDialogView::ShouldShowDialogTitle() const {
   if (delegate_)
     return delegate_->ShouldShowDialogTitle();
   return true;
@@ skipping 30 matching lines @@
   // This allows stuff like F10, etc to work correctly.
   DefWindowProc(event.os_event.hwnd, event.os_event.message,
                   event.os_event.wParam, event.os_event.lParam);
 #endif
 }
 
 void WebDialogView::CloseContents(WebContents* source) {
   bool close_dialog = false;
   OnCloseContents(source, &close_dialog);
   if (close_dialog)
-    OnDialogClosed(std::string());
+    OnDialogClosed(closed_via_webui_ ? dialog_close_retval_ : std::string());
 }
 
 content::WebContents* WebDialogView::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
   content::WebContents* new_contents = NULL;
   if (delegate_ &&
       delegate_->HandleOpenURLFromTab(source, params, &new_contents)) {
     return new_contents;
   }
@@ skipping 38 matching lines @@
   web_contents->SetDelegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above WebDialogUI in its header file for why.
   WebDialogUI::SetDelegate(web_contents, this);
 
   web_view_->LoadInitialURL(GetDialogContentURL());
 }
 
 }  // namespace views