InstantExtended: Transient naventry for preview.

chrome/browser/instant/instant_controller.cc

 // Copyright 2012 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/instant/instant_controller.h"
 
 #include "base/command_line.h"
+#include "base/debug/stack_trace.h"

[sreeram, 2013/01/25 18:17:29]

Remove this before submitting.

[Jered, 2013/01/25 19:27:18]

Done.

 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_tab.h"
@@ skipping 155 matching lines @@
       instant_enabled_(false),
       use_local_preview_only_(use_local_preview_only),
       model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       last_omnibox_text_has_inline_autocompletion_(false),
       last_verbatim_(false),
       last_transition_type_(content::PAGE_TRANSITION_LINK),
       last_match_was_search_(false),
       omnibox_focus_state_(OMNIBOX_FOCUS_NONE),
       start_margin_(0),
       end_margin_(0),
-      allow_preview_to_show_search_suggestions_(false) {
+      allow_preview_to_show_search_suggestions_(false),
+      instant_set_transient_entry_(false) {
 }
 
 InstantController::~InstantController() {
 }
 
 bool InstantController::Update(const AutocompleteMatch& match,
                                const string16& user_text,
                                const string16& full_text,
                                size_t selection_start,
                                size_t selection_end,
@@ skipping 708 matching lines @@
 
   // Commit the navigation if either:
   //  - The page is in NTP mode (so it could only navigate on a user click) or
   //  - The page is not in NTP mode and we are navigating to a URL with a
   //    different host or path than the instant URL. This enables the instant
   //    page when it is showing search results to change the query parameters
   //    and fragments of the URL without it navigating.
   if (model_.mode().is_ntp() ||
       (url.host() != instant_url.host() || url.path() != instant_url.path())) {
     CommitIfPossible(INSTANT_COMMIT_NAVIGATED);
+  } else {
+    UpdateTransientHistoryEntry(url);
   }
 }
 
 void InstantController::OmniboxLostFocus(gfx::NativeView view_gaining_focus) {
   // If the preview is showing custom NTP content, don't hide it, commit it
   // (no matter where the user clicked) or try to recreate it.
   if (model_.mode().is_ntp())
     return;
 
   // If the preview is not showing at all, recreate it if it's stale.
@@ skipping 159 matching lines @@
   // change the state just yet; else we may hide the preview unnecessarily.
   // Instead, the state will be set correctly after the commit is done.
   if (GetPreviewContents()) {
     model_.SetPreviewState(chrome::search::Mode(), 0, INSTANT_SIZE_PERCENT);
     allow_preview_to_show_search_suggestions_ = false;
 
     // Send a message asking the preview to clear out old results.
     loader_->Update(string16(), 0, 0, true);
   }
 
+  ResetTransientHistoryEntry();
+
   // Clear the first interaction timestamp for later use.
   first_interaction_time_ = base::Time();
 }
 
 void InstantController::ShowLoader(InstantShownReason reason,
                                    int height,
                                    InstantSizeUnits units) {
   // If we are on a committed search results page, the |loader_| is not in use.
   if (instant_tab_)
     return;
@@ skipping 37 matching lines @@
     model_.SetPreviewState(search_mode_, height, units);
   else
     model_.SetPreviewState(search_mode_, 100, INSTANT_SIZE_PERCENT);
 
   // If the user clicked on a query suggestion, also go ahead and commit the
   // overlay. This is necessary because if the overlay was partially visible
   // when the suggestion was clicked, the click itself would not commit the
   // overlay (because we're not full height).
   if (reason == INSTANT_SHOWN_CLICKED_QUERY_SUGGESTION)
     CommitIfPossible(INSTANT_COMMIT_CLICKED_QUERY_SUGGESTION);
+  else if (extended_enabled_ && IsFullHeight(model_))
+    SetTransientHistoryEntry();
+}
+
+void InstantController::SetTransientHistoryEntry() {
+  content::WebContents* active_tab = browser_->GetActiveWebContents();
+  // Save any transient entry already associated with the active tab.
+  content::NavigationEntry* old_transient_entry =
+      active_tab->GetController().GetTransientEntry();
+  if (old_transient_entry && !instant_set_transient_entry_)
+    transient_entry_.reset(
+        content::NavigationEntry::Create(*old_transient_entry));
+  // The loader's base navigation entry should describe the search provider
+  // without reference to a specific query. The alternative, updating the query
+  // in the tab title as the user types, would be distracting.
+  const content::NavigationEntry* base_entry = loader_->base_navigation_entry();
+  DCHECK(base_entry != NULL);
+  content::NavigationEntry* new_transient_entry =
+      content::NavigationEntry::Create(*base_entry);
+  active_tab->GetController().AddTransientEntry(new_transient_entry);
+  instant_set_transient_entry_ = true;
+}
+
+void InstantController::ResetTransientHistoryEntry() {
+  content::NavigationEntry* old_transient_entry = transient_entry_.release();
+  if (old_transient_entry) {
+    content::WebContents* active_tab = browser_->GetActiveWebContents();
+    active_tab->GetController().AddTransientEntry(old_transient_entry);
+    chrome::search::SearchTabHelper::FromWebContents(active_tab)->
+        NavigationEntryUpdated();
+  }
+  instant_set_transient_entry_ = false;
+}
+
+void InstantController::UpdateTransientHistoryEntry(const GURL& url) {
+  // URL should update so that if the user presses reload, we reload the page
+  // for the current query, but title remains unchanged so it doesn't flicker.
+  if (instant_set_transient_entry_) {
+    content::WebContents* active_tab = browser_->GetActiveWebContents();
+    content::NavigationEntry* transient_entry =
+        active_tab->GetController().GetTransientEntry();
+    transient_entry->SetURL(url);
+    transient_entry->SetVirtualURL(url);
+  }
 }
 
 void InstantController::SendPopupBoundsToPage() {
   if (last_popup_bounds_ == popup_bounds_ || !loader_ ||
       loader_->is_pointer_down_from_activate())
     return;
 
   last_popup_bounds_ = popup_bounds_;
   gfx::Rect preview_bounds = browser_->GetInstantBounds();
   gfx::Rect intersection = gfx::IntersectRects(popup_bounds_, preview_bounds);
@@ skipping 78 matching lines @@
   std::map<std::string, int>::const_iterator iter =
       blacklisted_urls_.find(*instant_url);
   if (iter != blacklisted_urls_.end() &&
       iter->second > kMaxInstantSupportFailures) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_BLOCKED_BY_BLACKLIST);
     return false;
   }
 
   return true;
 }