Add a top shadow to material design omnibox dropdown

chrome/browser/ui/views/omnibox/omnibox_popup_contents_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/omnibox/omnibox_popup_contents_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 51 matching lines @@
       location_bar_view_(location_bar_view),
       font_list_(font_list),
       ignore_mouse_drag_(false),
       size_animation_(this),
       start_margin_(0),
       end_margin_(0) {
   // The contents is owned by the LocationBarView.
   set_owned_by_client();
 
   ui::ThemeProvider* theme = location_bar_view_->GetThemeProvider();
+  top_shadow_ = theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
   int bottom_shadow_asset = ui::MaterialDesignController::IsModeMaterial() ?
       IDR_OMNIBOX_DROPDOWN_SHADOW_BOTTOM : IDR_BUBBLE_B;
   bottom_shadow_ = theme->GetImageSkiaNamed(bottom_shadow_asset);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 void OmniboxPopupContentsView::Init() {
   // This can't be done in the constructor as at that point we aren't
@@ skipping 105 matching lines @@
     }
     if (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL) {
       max_match_contents_width_ = std::max(
           max_match_contents_width_, view->GetMatchContentsWidth());
     }
   }
 
   for (size_t i = result_size; i < AutocompleteResult::kMaxMatches; ++i)
     child_at(i)->SetVisible(false);
 
+  // In non-material mode, we want the popup to appear as if it's overlaying
+  // the top of the page content, i.e., is flush against the client edge at the
+  // bottom of the toolbar. However, if the bookmarks bar is attached, we want
+  // to draw over it (so as not to push the results below it), but that means
+  // the toolbar won't be drawing a client edge separating itself from the
+  // popup. So we unconditionally overlap the toolbar by the thickness of the
+  // client edge and draw our own edge (see OnPaint()), which fixes the
+  // attached bookmark bar case without breaking the other case.
+  int top_edge_overlap = views::NonClientFrameView::kClientEdgeThickness;
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    // In material mode, we cover the bookmark bar similarly, but instead of
+    // appearing below the client edge, we want the popup to appear to overlay
+    // the bottom of the toolbar. So instead of drawing a client edge atop the
+    // popup, we shift the popup to completely cover the client edge, and then
+    // draw an additional semitransparent shadow above that. So the total
+    // overlap necessary is the client edge thickness plus the shadow height.
+    top_edge_overlap += top_shadow_->height();
+  }
+
   gfx::Point top_left_screen_coord;
   int width;
   location_bar_view_->GetOmniboxPopupPositioningInfo(
-      &top_left_screen_coord, &width, &start_margin_, &end_margin_);
+      &top_left_screen_coord, &width, &start_margin_,
+      &end_margin_, top_edge_overlap);
   gfx::Rect new_target_bounds(top_left_screen_coord,
                               gfx::Size(width, CalculatePopupHeight()));
 
   // If we're animating and our target height changes, reset the animation.
   // NOTE: If we just reset blindly on _every_ update, then when the user types
   // rapidly we could get "stuck" trying repeatedly to animate shrinking by the
   // last few pixels to get to one visible result.
   if (new_target_bounds.height() != target_bounds_.height())
     size_animation_.Reset();
   target_bounds_ = new_target_bounds;
@@ skipping 213 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, views::View overrides, private:
 
 const char* OmniboxPopupContentsView::GetClassName() const {
   return "OmniboxPopupContentsView";
 }
 
 void OmniboxPopupContentsView::OnPaint(gfx::Canvas* canvas) {
   // Top border.
-  canvas->FillRect(
-      gfx::Rect(0, 0, width(), views::NonClientFrameView::kClientEdgeThickness),
-      ThemeProperties::GetDefaultColor(
-          ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    canvas->TileImageInt(*top_shadow_, 0, 0, width(), top_shadow_->height());
+  } else {
+    canvas->FillRect(
+        gfx::Rect(0, 0, width(),
+                  views::NonClientFrameView::kClientEdgeThickness),
+        ThemeProperties::GetDefaultColor(
+            ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
+  }
 
   // Bottom border.
   canvas->TileImageInt(*bottom_shadow_, 0, height() - bottom_shadow_->height(),
                        width(), bottom_shadow_->height());
 }
 
 void OmniboxPopupContentsView::PaintChildren(const ui::PaintContext& context) {
   gfx::Rect contents_bounds = GetContentsBounds();
   ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
   const int border_interior = theme_provider->GetDisplayProperty(
@@ skipping 63 matching lines @@
   size_t index = GetIndexForPoint(event.location());
   if (!HasMatchAt(index))
     return;
   omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
                            GURL(), base::string16(), index);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
   return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
 }