alternate ntp (cros/partial-win): add tab-related stuff and toolbar/tab background change

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/search/search.h"
+#include "chrome/browser/ui/search/search_delegate.h"
+#include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
+#include "chrome/browser/ui/views/toolbar_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"  // Accessibility names
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 99 matching lines @@
     BrowserFrame* frame, BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       size_button_(NULL),
       close_button_(NULL),
       window_icon_(NULL),
       frame_painter_(new ash::FramePainter),
       size_button_minimizes_(false) {
 }
 
 BrowserNonClientFrameViewAsh::~BrowserNonClientFrameViewAsh() {
+  // A non-NULL |size_button_| means it was initialized in Init() where
+  // |this| was added as observer to ToolbarSearchAnimator, so remove it now.
+  if (size_button_) {
+    browser_view()->browser()->search_delegate()->toolbar_search_animator().
+        RemoveObserver(this);
+  }
 }
 
 void BrowserNonClientFrameViewAsh::Init() {
   // Panels only minimize.
   ash::FramePainter::SizeButtonBehavior size_button_behavior;
   if (browser_view()->browser()->is_type_panel() &&
       browser_view()->browser()->app_type() == Browser::APP_TYPE_CHILD) {
     size_button_minimizes_ = true;
     size_button_ = new views::ImageButton(this);
     size_button_behavior = ash::FramePainter::SIZE_BUTTON_MINIMIZES;
@@ skipping 16 matching lines @@
     AddChildView(window_icon_);
     window_icon_->Update();
   }
 
   // Create incognito icon if necessary.
   UpdateAvatarInfo();
 
   // Frame painter handles layout of these buttons.
   frame_painter_->Init(frame(), window_icon_, size_button_, close_button_,
                        size_button_behavior);
+
+  browser_view()->browser()->search_delegate()->toolbar_search_animator().
+      AddObserver(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameView overrides:
 
 gfx::Rect BrowserNonClientFrameViewAsh::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
   int tabstrip_x =
@@ skipping 74 matching lines @@
   // theme, so we look it up for each paint.
   frame_painter_->PaintHeader(
       this,
       canvas,
       ShouldPaintAsActive() ?
           ash::FramePainter::ACTIVE : ash::FramePainter::INACTIVE,
       GetThemeFrameImageId(),
       GetThemeFrameOverlayImage());
   if (browser_view()->ShouldShowWindowTitle())
     frame_painter_->PaintTitleBar(this, canvas, BrowserFrame::GetTitleFont());
-  if (browser_view()->IsToolbarVisible())
-    PaintToolbarBackground(canvas);
-  else
+  if (browser_view()->IsToolbarVisible()) {
+    chrome::search::Mode mode =

[sky, 2012/06/26 17:11:27]

I tend to think this code makes more sense in PaintToolbarBackground directly.

[kuan, 2012/06/26 23:25:49]

if i move this code to PaintToolbarBackground, how do i call it twice to paint
NTP background and then SEARCH background?

[sky, 2012/06/27 00:06:17]

Good point. Leave it then.

+        browser_view()->browser()->search_model()->mode();
+    bool fading_in = false;
+    // If mode is SEARCH, we might be waiting to fade in or fading in new

[sky, 2012/06/26 17:11:27]

Update comment.

[kuan, 2012/06/26 23:25:49]

Done.

+    // background, in which case, the previous background needs to be painted.
+    if (mode.is_search()) {
+      // Get current state of background animation to paint for SEARCH mode.

[sky, 2012/06/26 17:11:27]

Fold this into a better comment on 281.

[kuan, 2012/06/26 23:25:49]

Done.

+      chrome::search::ToolbarSearchAnimator::BackgroundState background_state =
+          chrome::search::ToolbarSearchAnimator::
+              BACKGROUND_STATE_SHOW_NON_APPLICABLE;
+      int new_background_opacity = -1;
+      browser_view()->browser()->search_delegate()->toolbar_search_animator().
+          GetCurrentBackgroundState(&background_state, &new_background_opacity);
+      if (background_state &
+          chrome::search::ToolbarSearchAnimator::BACKGROUND_STATE_SHOW_NTP) {
+        // Paint background for NTP mode.
+        PaintToolbarBackground(canvas, chrome::search::Mode::MODE_NTP);
+        // We're done if we're not showing background for SEARCH mode.
+        if (!(background_state & chrome::search::ToolbarSearchAnimator::
+                  BACKGROUND_STATE_SHOW_SEARCH)) {
+          return;
+        }
+        // Otherwise, we're fading in the new background at
+        // |new_background_opacity|.
+        fading_in = true;
+        canvas->SaveLayerAlpha(static_cast<uint8>(new_background_opacity));
+      }
+    }
+    // Paint the background for the current mode.
+    PaintToolbarBackground(canvas, mode.mode);
+    // If we're fading in and have saved canvas, restore it now.
+    if (fading_in)
+      canvas->Restore();
+  } else {
     PaintContentEdge(canvas);
+  }
 }
 
 void BrowserNonClientFrameViewAsh::Layout() {
   bool maximized_layout = UseShortHeader();
   frame_painter_->LayoutHeader(this, maximized_layout);
   if (avatar_button())
     LayoutAvatar();
   BrowserNonClientFrameView::Layout();
 }
 
@@ skipping 65 matching lines @@
 }
 
 gfx::ImageSkia BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {
   views::WidgetDelegate* delegate = frame()->widget_delegate();
   if (!delegate)
     return gfx::ImageSkia();
   return delegate->GetWindowIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// chrome::search::ToolbarSearchAnimator::Observer overrides:
+
+void BrowserNonClientFrameViewAsh::BackgroundChanging() {
+  // We're fading in the toolbar background, repaint the toolbar background.
+  browser_view()->toolbar()->SchedulePaint();
+}
+
+void BrowserNonClientFrameViewAsh::BackgroundChanged() {
+  // We've finished fading in the toolbar background, repaint the toolbar
+  // background.
+  browser_view()->toolbar()->SchedulePaint();
+}
+
+void BrowserNonClientFrameViewAsh::BackgroundChangeCanceled(
+    TabContents* tab_contents) {
+  // Fade in of toolbar background has been canceled, repaint the toolbar
+  // background.
+  browser_view()->toolbar()->SchedulePaint();
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 
 int BrowserNonClientFrameViewAsh::NonClientTopBorderHeight(
     bool force_restored) const {
   if (force_restored)
     return tabstrip_top_spacing_tall();
   if (frame()->IsFullscreen())
     return 0;
   // Windows with tab strips need a smaller non-client area.
@@ skipping 42 matching lines @@
       NonClientTopBorderHeight(false) + kContentShadowHeight:
       avatar_restored_y;
   gfx::Rect avatar_bounds(kAvatarSideSpacing,
                           avatar_y,
                           incognito_icon.width(),
                           avatar_bottom - avatar_y);
   avatar_button()->SetBoundsRect(avatar_bounds);
 }
 
 void BrowserNonClientFrameViewAsh::PaintToolbarBackground(
-    gfx::Canvas* canvas) {
+    gfx::Canvas* canvas,
+    chrome::search::Mode::Type mode) {
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (toolbar_bounds.IsEmpty())
     return;
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   ConvertPointToView(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
 
   int x = toolbar_bounds.x();
   int w = toolbar_bounds.width();
   int y = toolbar_bounds.y();
   int h = toolbar_bounds.height();
 
   // Gross hack: We split the toolbar images into two pieces, since sometimes
   // (popup mode) the toolbar isn't tall enough to show the whole image.  The
   // split happens between the top shadow section and the bottom gradient
   // section so that we never break the gradient.
   int split_point = kFrameShadowThickness * 2;
   int bottom_y = y + split_point;
   ui::ThemeProvider* tp = GetThemeProvider();
   int bottom_edge_height = h - split_point;
 
+  SkColor background_color = GetToolbarBackgroundColor(mode);
   canvas->FillRect(gfx::Rect(x, bottom_y, w, bottom_edge_height),
-                   tp->GetColor(ThemeService::COLOR_TOOLBAR));
+                   background_color);
 
   // Paint the main toolbar image.  Since this image is also used to draw the
   // tab background, we must use the tab strip offset to compute the image
   // source y position.  If you have to debug this code use an image editor
   // to paint a diagonal line through the toolbar image and ensure it lines up
   // across the tab and toolbar.
-  gfx::ImageSkia* theme_toolbar = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
+  gfx::ImageSkia* theme_toolbar = GetToolbarBackgroundImage(mode);
   canvas->TileImageInt(
       *theme_toolbar,
       x, bottom_y - GetHorizontalTabStripVerticalOffset(false),
       x, bottom_y,
       w, theme_toolbar->height());
 
   // The content area line has a shadow that extends a couple of pixels above
   // the toolbar bounds.
   const int kContentShadowHeight = 2;
   gfx::ImageSkia* toolbar_top =
@@ skipping 11 matching lines @@
                        y + kClientEdgeThickness + kContentShadowHeight,
                        toolbar_left->width(), theme_toolbar->height());
   gfx::ImageSkia* toolbar_right =
       tp->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_RIGHT);
   canvas->TileImageInt(*toolbar_right,
                        0, 0,
                        w - toolbar_right->width() - 2 * kClientEdgeThickness,
                        y + kClientEdgeThickness + kContentShadowHeight,
                        toolbar_right->width(), theme_toolbar->height());
 
-  // Draw the content/toolbar separator.
-  canvas->FillRect(gfx::Rect(x + kClientEdgeThickness,
-                             toolbar_bounds.bottom() - kClientEdgeThickness,
-                             w - (2 * kClientEdgeThickness),
-                             kClientEdgeThickness),
-      ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
+  // Only draw the content/toolbar separator if Instant Extended API is disabled
+  // or mode is DEFAULT.
+  bool extended_instant_enabled = chrome::search::IsInstantExtendedAPIEnabled(
+      browser_view()->browser()->profile());
+  if (!extended_instant_enabled || mode == chrome::search::Mode::MODE_DEFAULT) {
+    canvas->FillRect(
+        gfx::Rect(x + kClientEdgeThickness,
+                  toolbar_bounds.bottom() - kClientEdgeThickness,
+                  w - (2 * kClientEdgeThickness), kClientEdgeThickness),
+        ThemeService::GetDefaultColor(extended_instant_enabled ?
+            ThemeService::COLOR_SEARCH_SEPARATOR_LINE :
+                ThemeService::COLOR_TOOLBAR_SEPARATOR));
+  }
 }
 
 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) {
   canvas->FillRect(gfx::Rect(0, close_button_->bounds().bottom(),
                              width(), kClientEdgeThickness),
       ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
 }
 
 int BrowserNonClientFrameViewAsh::GetThemeFrameImageId() const {
   bool is_incognito = browser_view()->IsOffTheRecord();
@@ skipping 21 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }