omnibox: Don't paint children from inside OnPaint().

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 390 matching lines @@
                                font_list);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, views::View overrides, private:
 
 const char* OmniboxPopupContentsView::GetClassName() const {
   return "OmniboxPopupContentsView";
 }
 
-void OmniboxPopupContentsView::OnPaint(gfx::Canvas* canvas) {
+void OmniboxPopupContentsView::PaintChildren(gfx::Canvas* canvas,
+                                             const views::CullSet& cull_set) {
   gfx::Rect contents_bounds = GetContentsBounds();
   contents_bounds.set_height(
       contents_bounds.height() - bottom_shadow_->height() + kBorderInterior);
 
   gfx::Path path;
   MakeContentsPath(&path, contents_bounds);
   canvas->Save();
   canvas->sk_canvas()->clipPath(path,
                                 SkRegion::kIntersect_Op,
                                 true /* doAntialias */);
   PaintResultViews(canvas);
   canvas->Restore();
 
   // Top border.

[Peter Kasting, 2015/03/26 03:02:55]

Seems like maybe painting the top and bottom border should still be in
OnPaint(), and the stuff above here in PaintChildren()?

   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(gfx::Canvas* canvas,
-                                             const views::CullSet& cull_set) {
-  // We paint our children inside OnPaint().
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, private:
 
 views::View* OmniboxPopupContentsView::TargetForRect(views::View* root,
                                                      const gfx::Rect& rect) {
   CHECK_EQ(root, this);
   return this;
 }
 
 bool OmniboxPopupContentsView::HasMatchAt(size_t index) const {
@@ skipping 48 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)));
 }