Added prerendering to omnibox.

chrome/browser/prerender/prerender_observer.cc

 // 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.
 
 #include "chrome/browser/prerender/prerender_observer.h"
 
 #include "base/time.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 10 matching lines @@
 }
 
 void PrerenderObserver::ProvisionalChangeToMainFrameUrl(const GURL& url,
                                                         bool has_opener_set) {
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return;
   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);
 }
 
 bool PrerenderObserver::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(PrerenderObserver, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame,
                         OnDidStartProvisionalLoadForFrame)
   IPC_END_MESSAGE_MAP()
   return false;
 }
@@ skipping 19 matching lines @@
   }
 
   // Reset the PPLT metric.
   pplt_load_start_ = base::TimeTicks();
 }
 
 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() {
   PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
   if (!prerender_manager)
     return false;
   return prerender_manager->IsTabContentsPrerendering(tab_contents());
 }
 
 void PrerenderObserver::PrerenderSwappedIn() {
   // Ensure we are not prerendering any more.
   DCHECK(!IsPrerendering());
   if (pplt_load_start_.is_null()) {
     // If we have already finished loading, report a 0 PPLT.
     PrerenderManager::RecordPerceivedPageLoadTime(base::TimeDelta(),
                                                   tab_contents());
   } else {
     // If we have not finished loading yet, rebase the start time to now.
     pplt_load_start_ = base::TimeTicks::Now();
   }
 }
 
 }  // namespace prerender