alternate ntp: tweaks and fixes for bookmark bar in ntp

chrome/browser/ui/webui/ntp/ntp_resource_cache.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/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 100 matching lines @@
   SkColor color = tp->GetColor(id);
   // If web contents are being inverted because the system is in high-contrast
   // mode, any system theme colors we use must be inverted too to cancel out.
   return gfx::IsInvertedColorScheme() ?
       color_utils::InvertColor(color) : color;
 }
 
 // Get the CSS string for the background position on the new tab page for the
 // states when the bar is attached or detached.
 std::string GetNewTabBackgroundCSS(const ui::ThemeProvider* theme_provider,
-                                   bool bar_attached) {
+                                   bool bar_attached,
+                                   bool is_ntp_search) {
   int alignment;
   theme_provider->GetDisplayProperty(
       ThemeService::NTP_BACKGROUND_ALIGNMENT, &alignment);
 
   // TODO(glen): This is a quick workaround to hide the notused.png image when
   // no image is provided - we don't have time right now to figure out why
   // this is painting as white.
   // http://crbug.com/17593
   if (!theme_provider->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
     return "-64px";
   }
 
-  if (bar_attached)
+  // For instant extended API i.e. |is_ntp_search| is true, bookmark bar is
+  // always detached at bottom of content view in the y-direction, floating on
+  // top of it in the z-order, and not showing any part of the theme background
+  // image, so the content view should show the entire theme background image as
+  // is, with no vertical offset.
+  if (bar_attached || is_ntp_search)
     return ThemeService::AlignmentToString(alignment);
 
   if (alignment & ThemeService::ALIGN_TOP) {
     // The bar is detached, so we must offset the background by the bar size
     // if it's a top-aligned bar.
     int offset = chrome::kNTPBookmarkBarHeight;
 
     if (alignment & ThemeService::ALIGN_LEFT)
       return "left " + base::IntToString(-offset) + "px";
     else if (alignment & ThemeService::ALIGN_RIGHT)
@@ skipping 303 matching lines @@
   SkColor color_background =
       GetThemeColor(tp, ThemeService::COLOR_NTP_BACKGROUND);
 
   // Generate the replacements.
   std::vector<std::string> subst;
 
   // Cache-buster for background.
   subst.push_back(
       profile_->GetPrefs()->GetString(prefs::kCurrentThemeID));  // $1
 
+  bool is_ntp_search = chrome::search::IsInstantExtendedAPIEnabled(profile_);
+
   // Colors.
   subst.push_back(SkColorToRGBAString(color_background));  // $2
-  subst.push_back(GetNewTabBackgroundCSS(tp, false));  // $3
-  subst.push_back(GetNewTabBackgroundCSS(tp, true));  // $4
+  subst.push_back(GetNewTabBackgroundCSS(tp, false, is_ntp_search));  // $3
+  subst.push_back(GetNewTabBackgroundCSS(tp, true, is_ntp_search));  // $4
   subst.push_back(GetNewTabBackgroundTilingCSS(tp));  // $5
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_INCOGNITO_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string full_css = ReplaceStringPlaceholders(
       new_tab_theme_css, subst, NULL);
@@ skipping 50 matching lines @@
                      SkColorGetG(color_header),
                      SkColorGetB(color_header));
 
   // Generate the replacements.
   std::vector<std::string> subst;
 
   // Cache-buster for background.
   subst.push_back(
       profile_->GetPrefs()->GetString(prefs::kCurrentThemeID));  // $1
 
+  bool is_ntp_search = chrome::search::IsInstantExtendedAPIEnabled(profile_);
+
   // Colors.
   subst.push_back(SkColorToRGBAString(color_background));  // $2
-  subst.push_back(GetNewTabBackgroundCSS(tp, false));  // $3
-  subst.push_back(GetNewTabBackgroundCSS(tp, true));  // $4
+  subst.push_back(GetNewTabBackgroundCSS(tp, false, is_ntp_search));  // $3
+  subst.push_back(GetNewTabBackgroundCSS(tp, true, is_ntp_search));  // $4
   subst.push_back(GetNewTabBackgroundTilingCSS(tp));  // $5
   subst.push_back(SkColorToRGBAString(color_header));  // $6
   subst.push_back(SkColorToRGBAString(color_header_gradient_light));  // $7
   subst.push_back(SkColorToRGBAString(color_text));  // $8
   subst.push_back(SkColorToRGBAString(color_link));  // $9
   subst.push_back(SkColorToRGBAString(color_section));  // $10
   subst.push_back(SkColorToRGBAString(color_section_border));  // $11
   subst.push_back(SkColorToRGBAString(color_section_text));  // $12
   subst.push_back(SkColorToRGBAString(color_section_link));  // $13
   subst.push_back(SkColorToRGBAString(color_link_underline));  // $14
   subst.push_back(SkColorToRGBAString(color_section_link_underline));  // $15
   subst.push_back(SkColorToRGBAString(color_section_header_text));  // $16
   subst.push_back(SkColorToRGBAString(
       color_section_header_text_hover));  // $17
   subst.push_back(SkColorToRGBAString(color_section_header_rule));  // $18
   subst.push_back(SkColorToRGBAString(
       color_section_header_rule_light));  // $19
   subst.push_back(SkColorToRGBAString(
       SkColorSetA(color_section_header_rule, 0)));  // $20
   subst.push_back(SkColorToRGBAString(color_text_light));  // $21
   subst.push_back(SkColorToRGBComponents(color_section_border));  // $22
   subst.push_back(SkColorToRGBComponents(color_text));  // $23
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
+      ResourceBundle::GetSharedInstance().GetRawDataResource(is_ntp_search ?
           IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }