Merge 21685 - Relanding r21673 without reenabling the BrowserTest, which appa...

chrome/browser/renderer_host/render_view_host_delegate.h

 // Copyright (c) 2009 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 CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 127 matching lines @@
   };
 
   // RendererManagerment -------------------------------------------------------
   // Functions for managing switching of Renderers. For TabContents, this is
   // implemented by the RenderViewHostManager
 
   class RendererManagement {
    public:
     // Notification whether we should close the page, after an explicit call to
     // AttemptToClosePage.  This is called before a cross-site request or before
-    // a tab/window is closed, to allow the appropriate renderer to approve or
-    // deny the request.  |proceed| indicates whether the user chose to proceed.
-    virtual void ShouldClosePage(bool proceed) = 0;
+    // a tab/window is closed (as indicated by the first parameter) to allow the
+    // appropriate renderer to approve or deny the request.  |proceed| indicates
+    // whether the user chose to proceed.
+    virtual void ShouldClosePage(bool for_cross_site_transition,
+                                 bool proceed) = 0;
 
     // Called by ResourceDispatcherHost when a response for a pending cross-site
     // request is received.  The ResourceDispatcherHost will pause the response
     // until the onunload handler of the previous renderer is run.
     virtual void OnCrossSiteResponse(int new_render_process_host_id,
                                      int new_request_id) = 0;
 
     // Called the ResourceDispatcherHost's associate CrossSiteRequestHandler
     // when a cross-site navigation has been canceled.
     virtual void OnCrossSiteNavigationCanceled() = 0;
@@ skipping 360 matching lines @@
   virtual void LoadStateChanged(const GURL& url, net::LoadState load_state) {}
 
   // Returns true if this view is used to host an external tab container.
   virtual bool IsExternalTabContainer() const;
 
   // The RenderView has inserted one css file into page.
   virtual void DidInsertCSS() {}
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_