alternate ntp: tweaks and fixes for bookmark bar in ntp

chrome/browser/ui/views/frame/browser_view.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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
 #include "chrome/browser/native_window_notification_source.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
@@ skipping 186 matching lines @@
     BrowserView* browser_view,
     DetachableToolbarView* host_view,
     Browser* browser)
     : browser_view_(browser_view),
       host_view_(host_view),
       browser_(browser) {
 }
 
 void BookmarkExtensionBackground::Paint(gfx::Canvas* canvas,
                                         views::View* view) const {
+  ui::ThemeProvider* tp = host_view_->GetThemeProvider();
+
   // If search mode is |NTP|, bookmark bar is detached and floating on top of
   // the content view (in z-order) and below the "Most Visited" thumbnails (in
   // the y-direction).  It's visually nicer without the bookmark background, so
   // utilize the existing background of content view, giving the impression that
   // each bookmark button is part of the content view.
   const chrome::search::Mode& search_mode =
       browser_view_->browser()->search_model()->mode();
-  if (search_mode.is_ntp())
+  if (search_mode.is_ntp()) {
+    BookmarkModel* bookmark_model =
+        BookmarkModelFactory::GetForProfile(browser_->profile());
+    if (bookmark_model && bookmark_model->HasBookmarks()) {
+      // If a theme is being used, paint the theme background color at maximum
+      // 80% opacity to make the the bookmark bar more legible;
+      // otherwise, use a transparent background.
+      if (tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
+        const U8CPU kBackgroundOpacity = 204;  // 80% opacity
+        SkColor color = tp->GetColor(ThemeService::COLOR_NTP_BACKGROUND);
+        if (gfx::IsInvertedColorScheme())
+          color = color_utils::InvertColor(color);
+        if (SkColorGetA(color) > kBackgroundOpacity)
+          color = SkColorSetA(color, kBackgroundOpacity);
+        canvas->DrawColor(color);
+        DetachableToolbarView::PaintHorizontalBorder(canvas, host_view_);
+      } else {
+        const SkColor kBorderColor = SkColorSetARGB(25, 0, 0, 0);  // 10% black
+        DetachableToolbarView::PaintHorizontalBorderWithColor(
+            canvas, host_view_, kBorderColor);
+      }
+    }
     return;
+  }
 
-  ui::ThemeProvider* tp = host_view_->GetThemeProvider();
   int toolbar_overlap = host_view_->GetToolbarOverlap();
   // The client edge is drawn below the toolbar bounds.
   if (toolbar_overlap)
     toolbar_overlap += views::NonClientFrameView::kClientEdgeThickness;
   if (host_view_->IsDetached()) {
     // Draw the background to match the new tab page.
     int height = 0;
     WebContents* contents = chrome::GetActiveWebContents(browser_);
     if (contents && contents->GetView())
       height = contents->GetView()->GetContainerSize().height();
@@ skipping 20 matching lines @@
         v_padding, &rect, &roundness, host_view_);
     DetachableToolbarView::PaintContentAreaBackground(canvas, tp, rect,
                                                       roundness);
     DetachableToolbarView::PaintContentAreaBorder(canvas, tp, rect, roundness);
     if (!toolbar_overlap)
       DetachableToolbarView::PaintHorizontalBorder(canvas, host_view_);
   } else {
     DetachableToolbarView::PaintBackgroundAttachedMode(canvas, host_view_,
         browser_view_->OffsetPointForToolbarBackgroundImage(
             gfx::Point(host_view_->GetMirroredX(), host_view_->y())));
-    // For instant extended API, only draw bookmark separator for |MODE_DFEAULT|
-    // mode.
-    if (host_view_->height() >= toolbar_overlap && search_mode.is_default())
+    if (host_view_->height() >= toolbar_overlap)
       DetachableToolbarView::PaintHorizontalBorder(canvas, host_view_);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ResizeCorner, private:
 
 class ResizeCorner : public views::View {
  public:
   ResizeCorner() {
@@ skipping 2276 matching lines @@
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }
 
 void BrowserView::MaybeStackBookmarkBarAtTop() {
   if (bookmark_bar_view_.get())
     bookmark_bar_view_->MaybeStackAtTop();
 }