alternate ntp: toolbar background and separator animation

chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/views/tabs/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 425 matching lines @@
 
 void BrowserTabStripController::TabBlockedStateChanged(
     TabContents* contents,
     int model_index) {
   SetTabDataAt(contents, model_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, chrome::search::SearchModelObserver:
 
-void BrowserTabStripController::ModeChanged(const chrome::search::Mode& mode) {
+void BrowserTabStripController::ModeChanged(
+    const chrome::search::Mode& old_mode,
+    const chrome::search::Mode& new_mode) {
   // Mode has changed, set tab data based on new mode, which will trigger
   // repainting of tab's background.
   int active_index = GetActiveIndex();
   DCHECK_NE(active_index, -1);
   SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, chrome::search::ToolbarSearchAnimator::Observer:
 
 void BrowserTabStripController::OnToolbarBackgroundAnimatorProgressed() {
   // We're fading in the tab background, set tab data based on new background
   // state and possibly opacity value, which will trigger repainting of tab's
   // background.
   int active_index = GetActiveIndex();
   DCHECK_NE(active_index, -1);
   SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index);
 }
 
 void BrowserTabStripController::OnToolbarBackgroundAnimatorCanceled(
     TabContents* tab_contents) {
   // Fade in of tab background has been canceled, which can happen in 2
   // scenarios:
   // 1) a deactivated or detached or closing tab, whose |tab_contents| is the
   //    the formal parameter: make sure |tab_contents| still exist in tab model.
   // 2) mode change of active tab, as indicated by a NULL |tab_contents|: make
   //    sure active tab exists, and retrieve its |tab_contents|.
-  // If we proceed, set tab data so that |TabRendererData::background_state| and
-  // |TabRendererData::search_background_opacity| will be reset.
+  // If we proceed, set tab data so that
+  // |TabRendererData::gradient_background_opacity| will be reset.
   // Repainting of tab's background will be triggered in the process.
   int index = tab_contents ? model_->GetIndexOfTabContents(tab_contents) :
                              GetActiveIndex();
   if (index == -1)
     return;
   SetTabDataAt(tab_contents ? tab_contents :
       chrome::GetTabContentsAt(browser_, index), index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 28 matching lines @@
   data->title = contents->GetTitle();
   data->url = contents->GetURL();
   data->loading = contents->IsLoading();
   data->crashed_status = contents->GetCrashedStatus();
   data->incognito = contents->GetBrowserContext()->IsOffTheRecord();
   data->show_icon = tab_contents->favicon_tab_helper()->ShouldDisplayFavicon();
   data->mini = model_->IsMiniTab(model_index);
   data->blocked = model_->IsTabBlocked(model_index);
   data->app = tab_contents->extension_tab_helper()->is_app();
   data->mode = browser_->search_model()->mode().mode;
-  if (data->mode == chrome::search::Mode::MODE_SEARCH) {
-    // Get current state of background animation to paint for SEARCH mode.
-    browser_->search_delegate()->toolbar_search_animator().
-        GetCurrentBackgroundState(&data->background_state,
-                                  &data->search_background_opacity);
-  } else {
-    data->background_state =
-        chrome::search::ToolbarSearchAnimator::BACKGROUND_STATE_DEFAULT;
-    // Valid opacity value of double data type is 0f to 1f, so use -1f to
-    // indicate an invalid value.
-    data->search_background_opacity = -1.0f;
-  }
+  // Get current gradient background animation to paint.
+  data->gradient_background_opacity = browser_->search_delegate()->
+      toolbar_search_animator().GetGradientOpacity();
 }
 
 void BrowserTabStripController::SetTabDataAt(
     TabContents* contents,
     int model_index) {
   TabRendererData data;
   SetTabRendererDataFromModel(contents->web_contents(), model_index, &data,
                               EXISTING_TAB);
   tabstrip_->SetTabData(model_index, data);
 }
@@ skipping 35 matching lines @@
   SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB);
   tabstrip_->AddTabAt(index, data, is_active);
 }
 
 void BrowserTabStripController::UpdateLayoutType() {
   bool adjust_layout = false;
   TabStripLayoutType layout_type =
       DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
   tabstrip_->SetLayoutType(layout_type, adjust_layout);
 }