alternate ntp: toolbar background and separator animation

chrome/browser/ui/search/search_tab_helper.cc

 // Copyright (c) 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/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 namespace chrome {
 namespace search {
 
 SearchTabHelper::SearchTabHelper(
     TabContents* contents,
     bool is_search_enabled)
     : WebContentsObserver(contents->web_contents()),
       is_search_enabled_(is_search_enabled),
-      model_(contents) {
+      model_(contents),
+      has_navigated_(false) {
   if (!is_search_enabled)
     return;
 
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           &contents->web_contents()->GetController()));
 }
 
@@ skipping 30 matching lines @@
   Mode::Type mode = Mode::MODE_DEFAULT;
   GURL url(web_contents()->GetURL());
   // TODO(kuan): revisit this condition when zero suggest becomes available.
   if (google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec()) ||
       (edit_model->has_focus() && edit_model->user_input_in_progress())) {
     mode = Mode::MODE_SEARCH;
   }
   model_.SetMode(Mode(mode, true));
 }
 
-void SearchTabHelper::NavigateToPendingEntry(
-    const GURL& url,
-    content::NavigationController::ReloadType reload_type) {
-  if (!is_search_enabled_)
-    return;
-
-  UpdateModel(url);
-  FlushNTP(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();
-  UpdateModel(committed_details->entry->GetURL());
+  UpdateModel(committed_details->entry->GetURL(), has_navigated_);
+  has_navigated_ = true;
   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) {
   if (!IsNTP(url) &&
       !google_util::IsInstantExtendedAPIGoogleSearchUrl(url.spec())) {
     ntp_web_contents_.reset();
   }
 }
 
 }  // namespace search
 }  // namespace chrome