alternate ntp: toolbar background and separator animation

chrome/browser/ui/views/tabs/tab.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/tab.h"
 
 #include <limits>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 500 matching lines @@
     case chrome::search::Mode::MODE_SEARCH:
     case chrome::search::Mode::MODE_DEFAULT:
     default:
       return tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR_SEARCH);
   }
 }
 
 void Tab::PaintTabBackground(gfx::Canvas* canvas) {
   if (IsActive()) {
     bool fading_in = false;
-    // If mode is SEARCH, we might be waiting to fade in or fading in new
-    // background, in which case, the previous background needs to be painted.
-    if (data().mode == chrome::search::Mode::MODE_SEARCH &&
-        data().background_state &
-            chrome::search::ToolbarSearchAnimator::BACKGROUND_STATE_NTP) {
-      // Paint background for NTP mode.
+    // If |gradient_background_opacity| < 1f, paint flat background at full
+    // opacity, and only paint gradient background if
+    // |gradient_background_opacity| is not 0f;
+    // if |gradient_opacity| is 1f, paint the background for the current mode
+    // at full opacity.
+    if (data().gradient_background_opacity < 1.0f) {
+      // Paint flat background of NTP mode.
       PaintActiveTabBackground(canvas,
           GetTabBackgroundImage(chrome::search::Mode::MODE_NTP));
-      // We're done if we're not showing background for |MODE_SEARCH|.
-      if (!(data().background_state & chrome::search::ToolbarSearchAnimator::
-            BACKGROUND_STATE_SEARCH)) {
+      // We're done if we're not showing gradient background.
+      if (data().gradient_background_opacity == 0.0f)
         return;
-      }
-      // Otherwise, we're fading in the background for |MODE_SEARCH| at
-      // |data().search_background_opacity|.
+      // Otherwise, we're fading in the gradient background at
+      // |data().gradient_background_opacity|.
       fading_in = true;
       canvas->SaveLayerAlpha(
-          static_cast<uint8>(data().search_background_opacity * 0xFF),
+          static_cast<uint8>(data().gradient_background_opacity * 0xFF),
           gfx::Rect(width(), height()));
     }
     // Paint the background for the current mode.
     PaintActiveTabBackground(canvas, GetTabBackgroundImage(data().mode));
-    // If we're fading in and have saved canvas, restore it now.
+    // If we're fading and have saved canvas, restore it now.
     if (fading_in)
       canvas->Restore();
   } else {
     if (mini_title_animation_.get() && mini_title_animation_->is_animating())
       PaintInactiveTabBackgroundWithTitleChange(canvas);
     else
       PaintInactiveTabBackground(canvas);
 
     double throb_value = GetThrobValue();
     if (throb_value > 0) {
@@ skipping 261 matching lines @@
       rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_RIGHT_SEARCH);
   tab_active_search_.l_width = tab_active_search_.image_l->width();
   tab_active_search_.r_width = tab_active_search_.image_r->width();
 
   tab_inactive_.image_l = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }