| Index: chrome/browser/prerender/prerender_observer.cc
|
| diff --git a/chrome/browser/prerender/prerender_observer.cc b/chrome/browser/prerender/prerender_observer.cc
|
| index 8f286aa6c5601d7cff730ebc44170b475afdd8c8..ec0d56225cd7bcb86081f55a69f4d388d74e5bdb 100644
|
| --- a/chrome/browser/prerender/prerender_observer.cc
|
| +++ b/chrome/browser/prerender/prerender_observer.cc
|
| @@ -28,7 +28,7 @@ void PrerenderObserver::ProvisionalChangeToMainFrameUrl(const GURL& url,
|
| if (prerender_manager->IsTabContentsPrerendering(tab_contents()))
|
| return;
|
| prerender_manager->MarkTabContentsAsNotPrerendered(tab_contents());
|
| - MaybeUsePreloadedPage(url, has_opener_set);
|
| + MaybeUsePrerenderedPage(url, has_opener_set);
|
| prerender_manager->RecordNavigation(url);
|
| }
|
|
|
| @@ -68,15 +68,15 @@ PrerenderManager* PrerenderObserver::MaybeGetPrerenderManager() {
|
| return tab_contents()->profile()->GetPrerenderManager();
|
| }
|
|
|
| -bool PrerenderObserver::MaybeUsePreloadedPage(const GURL& url,
|
| - bool has_opener_set) {
|
| +bool PrerenderObserver::MaybeUsePrerenderedPage(const GURL& url,
|
| + bool has_opener_set) {
|
| PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
|
| if (!prerender_manager)
|
| return false;
|
| DCHECK(!prerender_manager->IsTabContentsPrerendering(tab_contents()));
|
| - return prerender_manager->MaybeUsePreloadedPage(tab_contents(),
|
| - url,
|
| - has_opener_set);
|
| + return prerender_manager->MaybeUsePrerenderedPage(tab_contents(),
|
| + url,
|
| + has_opener_set);
|
| }
|
|
|
| bool PrerenderObserver::IsPrerendering() {
|
|
|