Use TYPED PageTransition for Omnibox prerendering.

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 301 matching lines @@
       Source<RenderViewHostDelegate>(GetRenderViewHostDelegate()));
 
   // Register for new windows from any source.
   notification_registrar_.Add(
       this, content::NOTIFICATION_CREATING_NEW_WINDOW_CANCELLED,
       Source<TabContents>(new_contents));
 
   DCHECK(load_start_time_.is_null());
   load_start_time_ = base::TimeTicks::Now();
 
-  new_contents->controller().LoadURL(prerender_url_,
-                                     referrer_, PageTransition::LINK,
+  PageTransition::Type transition = PageTransition::LINK;
+  if (origin_ == ORIGIN_OMNIBOX_ORIGINAL ||

[cbentzel, 2011/10/10 15:55:15]

Perhaps an IsOmniboxOrigin() helper? 

[dominich, 2011/10/10 15:57:47]

I considered it, but these two origins are only going to be split for the field
trial. Once the field trial ends, there'll only be a single omnibox origin.

+      origin_ == ORIGIN_OMNIBOX_CONSERVATIVE) {
+    transition = PageTransition::TYPED;
+  }
+  new_contents->controller().LoadURL(prerender_url_, referrer_, transition,
                                      std::string());
 }
 
 bool PrerenderContents::GetChildId(int* child_id) const {
   CHECK(child_id);
   DCHECK_GE(child_id_, -1);
   *child_id = child_id_;
   return child_id_ != -1;
 }
 
@@ skipping 320 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->tab_contents())
     return false;
   const TabContents* tab_contents = prerender_contents_->tab_contents();
   return (tab_contents->GetSiteInstance() !=
           tab_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender