Added prerendering to omnibox.

chrome/browser/prerender/prerender_contents.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_contents.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/process_util.h"
@@ skipping 42 matching lines @@
   }
   GURL url_;
 };
 
 }  // end namespace
 
 class PrerenderContentsFactoryImpl : public PrerenderContents::Factory {
  public:
   virtual PrerenderContents* CreatePrerenderContents(
       PrerenderManager* prerender_manager, PrerenderTracker* prerender_tracker,
-      Profile* profile, const GURL& url, const GURL& referrer) OVERRIDE {
+      Profile* profile, const GURL& url, const GURL& referrer,
+      Origin origin) OVERRIDE {
     return new PrerenderContents(prerender_manager, prerender_tracker, profile,
-                                 url, referrer);
+                                 url, referrer, origin);
   }
 };
 
 // TabContentsDelegateImpl -----------------------------------------------------
 
 class PrerenderContents::TabContentsDelegateImpl
     : public TabContentsDelegate {
  public:
   explicit TabContentsDelegateImpl(PrerenderContents* prerender_contents) :
       prerender_contents_(prerender_contents) {
@@ skipping 41 matching lines @@
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   PrerenderContents* prerender_contents_;
 };
 
 PrerenderContents::PrerenderContents(PrerenderManager* prerender_manager,
                                      PrerenderTracker* prerender_tracker,
                                      Profile* profile,
                                      const GURL& url,
-                                     const GURL& referrer)
+                                     const GURL& referrer,
+                                     Origin origin)
     : prerender_manager_(prerender_manager),
       prerender_tracker_(prerender_tracker),
       prerender_url_(url),
       referrer_(referrer),
       profile_(profile),
       page_id_(0),
       has_stopped_loading_(false),
       final_status_(FINAL_STATUS_MAX),
       prerendering_has_started_(false),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
       route_id_(-1),
-      starting_page_id_(-1) {
+      starting_page_id_(-1),
+      origin_(origin) {
   DCHECK(prerender_manager != NULL);
 }
 
 bool PrerenderContents::Init() {
   return AddAliasURL(prerender_url_);
 }
 
 // static
 PrerenderContents::Factory* PrerenderContents::CreateFactory() {
   return new PrerenderContentsFactoryImpl();
 }
 
 void PrerenderContents::StartPrerendering(
     const RenderViewHost* source_render_view_host) {
   DCHECK(profile_ != NULL);
   DCHECK(!prerendering_has_started_);
   DCHECK(prerender_contents_.get() == NULL);
-  DCHECK(source_render_view_host != NULL);
-  DCHECK(source_render_view_host->view() != NULL);
 
   prerendering_has_started_ = true;
   TabContents* new_contents = new TabContents(profile_, NULL, MSG_ROUTING_NONE,
                                               NULL, NULL);
   prerender_contents_.reset(new TabContentsWrapper(new_contents));
   TabContentsObserver::Observe(new_contents);
   prerender_contents_->download_tab_helper()->set_delegate(this);
 
-  TabContents* source_tc =
-      source_render_view_host->delegate()->GetAsTabContents();
-  if (source_tc) {
-    // So that history merging will work, get the max page ID
-    // of the old page, and add a safety margin of 10 to it (for things
-    // such as redirects).
-    starting_page_id_ = source_tc->GetMaxPageID();
-    if (starting_page_id_ < 0)
-      starting_page_id_ = 0;
-    starting_page_id_ += kPrerenderPageIdOffset;
-    prerender_contents_->controller().set_max_restored_page_id(
-        starting_page_id_);
+  if (source_render_view_host) {
+    DCHECK(source_render_view_host->view() != NULL);
+    TabContents* source_tc =
+        source_render_view_host->delegate()->GetAsTabContents();
+    if (source_tc) {
+      // So that history merging will work, get the max page ID
+      // of the old page, and add a safety margin of 10 to it (for things
+      // such as redirects).
+      starting_page_id_ = source_tc->GetMaxPageID();
+      if (starting_page_id_ < 0)
+        starting_page_id_ = 0;
+      starting_page_id_ += kPrerenderPageIdOffset;
+      prerender_contents_->controller().set_max_restored_page_id(
+          starting_page_id_);
 
-    tab_contents_delegate_.reset(new TabContentsDelegateImpl(this));
-    new_contents->set_delegate(tab_contents_delegate_.get());
+      tab_contents_delegate_.reset(new TabContentsDelegateImpl(this));
+      new_contents->set_delegate(tab_contents_delegate_.get());
 
-    // Set the size of the new TC to that of the old TC.
-    gfx::Rect tab_bounds;
-    source_tc->view()->GetContainerBounds(&tab_bounds);
-    prerender_contents_->view()->SizeContents(tab_bounds.size());
+      // Set the size of the new TC to that of the old TC.
+      gfx::Rect tab_bounds;
+      source_tc->view()->GetContainerBounds(&tab_bounds);
+      prerender_contents_->view()->SizeContents(tab_bounds.size());
+    }
   }
 
   // Register as an observer of the RenderViewHost so we get messages.
   render_view_host_observer_.reset(
       new PrerenderRenderViewHostObserver(this, render_view_host_mutable()));
 
   child_id_ = render_view_host()->process()->id();
   route_id_ = render_view_host()->routing_id();
 
   // Register this with the ResourceDispatcherHost as a prerender
@@ skipping 67 matching lines @@
 
 FinalStatus PrerenderContents::final_status() const {
   return final_status_;
 }
 
 PrerenderContents::~PrerenderContents() {
   DCHECK(final_status_ != FINAL_STATUS_MAX);
   DCHECK(prerendering_has_been_cancelled_ ||
          final_status_ == FINAL_STATUS_USED ||
          final_status_ == FINAL_STATUS_CONTROL_GROUP);
+  DCHECK(origin_ != ORIGIN_MAX);
 
   // If we haven't even started prerendering, we were just in the control
   // group, which means we do not want to record the status.
   if (prerendering_has_started())
-    RecordFinalStatus(final_status_);
+    RecordFinalStatus(origin_, final_status_);
 
   if (child_id_ != -1 && route_id_ != -1)
     prerender_tracker_->OnPrerenderingFinished(child_id_, route_id_);
 
   // If we still have a TabContents, clean up anything we need to and then
   // destroy it.
   if (prerender_contents_.get())
     delete ReleasePrerenderContents();
 
   // The following URLs are no longer rendering.
@@ skipping 280 matching lines @@
     return NULL;
   DictionaryValue* dict_value = new DictionaryValue();
   dict_value->SetString("url", prerender_url_.spec());
   base::TimeTicks current_time = base::TimeTicks::Now();
   base::TimeDelta duration = current_time - load_start_time_;
   dict_value->SetInteger("duration", duration.InSeconds());
   return dict_value;
 }
 
 }  // namespace prerender