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 81 matching lines @@
     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);
+// TODO(samarth): check with Kuan that this is safe to remove.

[dhollowa, 2013/01/10 18:50:29]

I expect this is ok, but you'll need to change line 188 to remove the
conditional otherwise navigating to NTP won't get noticed at all.

[samarth, 2013/01/11 19:43:05]

Done (I assume you meant line 118?).  I've sent an email to kuan@ but went ahead
and just deleted this stuff.  I can add it back in if necessary.

+//  // 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());
-  }
+  if (!IsNTP(committed_details->entry->GetVirtualURL()))
+    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