Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / unload_controller.cc

diff --git a/src/chrome/browser/ui/unload_controller.cc b/src/chrome/browser/ui/unload_controller.cc
index 559ab84..878429b 100644 (file)
--- a/src/chrome/browser/ui/unload_controller.cc
+++ b/src/chrome/browser/ui/unload_controller.cc
@@ -13,7 +13,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ -69,7 +68,7 @@ bool UnloadController::RunUnloadEventsHelper(content::WebContents* contents) {
     // them. Once they have fired, we'll get a message back saying whether
     // to proceed closing the page or not, which sends us back to this method
     // with the NeedToFireBeforeUnload bit cleared.
-    contents->GetMainFrame()->DispatchBeforeUnload(false);
+    contents->DispatchBeforeUnload(false);
     return true;
   }
   return false;
@@ -297,7 +296,7 @@ void UnloadController::ProcessPendingTabs() {
       // and then call beforeunload handlers for |web_contents|.
       // See DevToolsWindow::InterceptPageBeforeUnload for details.
       if (!DevToolsWindow::InterceptPageBeforeUnload(web_contents))
-        web_contents->GetMainFrame()->DispatchBeforeUnload(false);
+        web_contents->DispatchBeforeUnload(false);
     } else {
       ClearUnloadState(web_contents, true);
     }