InstantExtended: Committed NTP

chrome/browser/ui/search/search_tab_helper.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/ui/search/search_tab_helper.h"
 
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 43 matching lines @@
   return template_url->HasSearchTermsReplacementKey(url) &&
       template_url->ExtractSearchTermsFromURL(url, &result) && !result.empty();
 }
 
 }  // namespace
 
 namespace chrome {
 namespace search {
 
 SearchTabHelper::SearchTabHelper(content::WebContents* web_contents)
-    : WebContentsObserver(web_contents),
-      is_search_enabled_(IsSearchEnabled(ProfileFromWebContents(web_contents))),
+    : is_search_enabled_(IsSearchEnabled(ProfileFromWebContents(web_contents))),
       user_input_in_progress_(false),
       model_(web_contents) {
   if (!is_search_enabled_)
     return;
 
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           &web_contents->GetController()));
@@ skipping 13 matching lines @@
 
   UpdateModelBasedOnURL(web_contents()->GetURL());
 }
 
 void SearchTabHelper::NavigationEntryUpdated() {
   if (!is_search_enabled_)
     return;
   UpdateModelBasedOnURL(web_contents()->GetURL());
 }
 
-void SearchTabHelper::NavigateToPendingEntry(
-    const GURL& url,
-    content::NavigationController::ReloadType reload_type) {
-  if (!is_search_enabled_)
-    return;
-
-  // NTP mode changes are initiated at "pending", all others are initiated
-  // when "committed".  This is because NTP is rendered natively so is faster
-  // to render than the web contents and we need to coordinate the animations.
-  if (IsNTP(url))
-    UpdateModelBasedOnURL(url);
-}
-
 void SearchTabHelper::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type);
   content::LoadCommittedDetails* committed_details =
       content::Details<content::LoadCommittedDetails>(details).ptr();
-  // See comment in |NavigateToPendingEntry()| about why |!IsNTP()| is used.
-  if (!IsNTP(committed_details->entry->GetURL())) {
-    UpdateModelBasedOnURL(committed_details->entry->GetURL());
-  }
+  UpdateModelBasedOnURL(committed_details->entry->GetVirtualURL());
 }
 
 void SearchTabHelper::UpdateModelBasedOnURL(const GURL& url) {
   Mode::Type type = Mode::MODE_DEFAULT;
   Mode::Origin origin = Mode::ORIGIN_DEFAULT;
   if (IsNTP(url)) {
     type = Mode::MODE_NTP;
     origin = Mode::ORIGIN_NTP;
   } else if (IsSearchResults(url, ProfileFromWebContents(web_contents()))) {
     type = Mode::MODE_SEARCH_RESULTS;
     origin = Mode::ORIGIN_SEARCH;
   }
   if (user_input_in_progress_)
     type = Mode::MODE_SEARCH_SUGGESTIONS;
   model_.SetMode(Mode(type, origin));
 }
 
 const content::WebContents* SearchTabHelper::web_contents() const {
   return model_.web_contents();
 }
 
 }  // namespace search
 }  // namespace chrome