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

chrome/browser/tab_contents/render_view_host_manager.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_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 142 matching lines @@
     interstitial_page_ = NULL;
   }
 
   // Returns the currently showing interstitial, NULL if no interstitial is
   // showing.
   InterstitialPage* interstitial_page() const {
     return interstitial_page_;
   }
 
   // RenderViewHostDelegate::RendererManagement implementation.
-  virtual void ShouldClosePage(bool proceed);
+  virtual void ShouldClosePage(bool for_cross_site_transition, bool proceed);
   virtual void OnCrossSiteResponse(int new_render_process_host_id,
                                    int new_request_id);
   virtual void OnCrossSiteNavigationCanceled();
 
  private:
   friend class TestTabContents;
 
   // Returns whether this tab should transition to a new renderer for
   // cross-site URLs.  Enabled unless we see the --process-per-tab command line
   // switch.  Can be overridden in unit tests.
@@ skipping 69 matching lines @@
 };
 
 // The "details" for a NOTIFY_RENDER_VIEW_HOST_CHANGED notification. The old
 // host can be NULL when the first RenderViewHost is set.
 struct RenderViewHostSwitchedDetails {
   RenderViewHost* old_host;
   RenderViewHost* new_host;
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_