Index: chrome/browser/ui/search/search_tab_helper.cc |
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc |
index efccd6fca51dba311b5c76f5803bbf6f049e3037..42c7dd5bd2fb343b092e2ccf628d019f508987d2 100644 |
--- a/chrome/browser/ui/search/search_tab_helper.cc |
+++ b/chrome/browser/ui/search/search_tab_helper.cc |
@@ -91,7 +91,7 @@ void SearchTabHelper::NavigateToPendingEntry( |
if (!is_search_enabled_) |
return; |
- UpdateModel(url); |
+ UpdateModel(url, !web_contents()->GetController().IsInitialNavigation()); |
FlushNTP(url); |
} |
@@ -102,17 +102,18 @@ void SearchTabHelper::Observe( |
DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type); |
content::LoadCommittedDetails* committed_details = |
content::Details<content::LoadCommittedDetails>(details).ptr(); |
- UpdateModel(committed_details->entry->GetURL()); |
+ UpdateModel(committed_details->entry->GetURL(), |
+ web_contents()->GetController().IsInitialNavigation()); |
FlushNTP(committed_details->entry->GetURL()); |
} |
-void SearchTabHelper::UpdateModel(const GURL& url) { |
+void SearchTabHelper::UpdateModel(const GURL& url, bool animate) { |
Mode::Type type = Mode::MODE_DEFAULT; |
if (IsNTP(url)) |
type = Mode::MODE_NTP; |
else if (google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec())) |
type = Mode::MODE_SEARCH; |
- model_.SetMode(Mode(type, true)); |
+ model_.SetMode(Mode(type, animate)); |
} |
void SearchTabHelper::FlushNTP(const GURL& url) { |