Merge of 97624 to 835 branch.

chrome/browser/prerender/prerender_contents.h

 // Copyright (c) 2011 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_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 142 matching lines @@
   void Destroy(FinalStatus reason);
 
   // Applies all the URL history encountered during prerendering to the
   // new tab.
   void CommitHistory(TabContentsWrapper* tab);
 
   int32 starting_page_id() { return starting_page_id_; }
 
   base::Value* GetAsValue() const;
 
+  // Returns whether a pending cross-site navigation is happening.
+  // This could happen with renderer-issued navigations, such as a
+  // MouseEvent being dispatched by a link to a website installed as an app.
+  bool IsCrossSiteNavigationPending() const;
+
  protected:
   PrerenderContents(PrerenderManager* prerender_manager,
                     PrerenderTracker* prerender_tracker,
                     Profile* profile,
                     const GURL& url,
                     const GURL& referrer,
                     Origin origin,
                     uint8 experiment_id);
 
   NotificationRegistrar& notification_registrar() {
@@ skipping 102 matching lines @@
 
   // Offset by which to offset prerendered pages
   static const int32 kPrerenderPageIdOffset = 10;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_