Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: chrome/browser/prerender/prerender_contents.h

Issue 7618016: Additional fixes for prerender/instant + browsing history. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Wrong signature Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 void Destroy(FinalStatus reason); 154 void Destroy(FinalStatus reason);
155 155
156 // Applies all the URL history encountered during prerendering to the 156 // Applies all the URL history encountered during prerendering to the
157 // new tab. 157 // new tab.
158 void CommitHistory(TabContentsWrapper* tab); 158 void CommitHistory(TabContentsWrapper* tab);
159 159
160 int32 starting_page_id() { return starting_page_id_; } 160 int32 starting_page_id() { return starting_page_id_; }
161 161
162 base::Value* GetAsValue() const; 162 base::Value* GetAsValue() const;
163 163
164 // Returns whether a pending cross-site navigation is happening.
165 // This could happen with renderer-issued navigations, such as a
166 // MouseEvent being dispatched by a link to a website installed as an app.
167 bool IsCrossSiteNavigationPending() const;
168
164 protected: 169 protected:
165 PrerenderContents(PrerenderManager* prerender_manager, 170 PrerenderContents(PrerenderManager* prerender_manager,
166 PrerenderTracker* prerender_tracker, 171 PrerenderTracker* prerender_tracker,
167 Profile* profile, 172 Profile* profile,
168 const GURL& url, 173 const GURL& url,
169 const GURL& referrer, 174 const GURL& referrer,
170 Origin origin, 175 Origin origin,
171 uint8 experiment_id); 176 uint8 experiment_id);
172 177
173 NotificationRegistrar& notification_registrar() { 178 NotificationRegistrar& notification_registrar() {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 281
277 // Offset by which to offset prerendered pages 282 // Offset by which to offset prerendered pages
278 static const int32 kPrerenderPageIdOffset = 10; 283 static const int32 kPrerenderPageIdOffset = 10;
279 284
280 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 285 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
281 }; 286 };
282 287
283 } // namespace prerender 288 } // namespace prerender
284 289
285 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 290 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_contents.cc » ('j') | content/browser/tab_contents/tab_contents.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698