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

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
@@ skipping 63 matching lines @@
 
  protected:
   OmniboxPopupContentsView(const gfx::FontList& font_list,
                            OmniboxView* omnibox_view,
                            OmniboxEditModel* edit_model,
                            LocationBarView* location_bar_view);
   ~OmniboxPopupContentsView() override;
 
   LocationBarView* location_bar_view() { return location_bar_view_; }
 
-  virtual void PaintResultViews(gfx::Canvas* canvas);
-
   // Calculates the height needed to show all the results in the model.
   virtual int CalculatePopupHeight();
   virtual OmniboxResultView* CreateResultView(int model_index,
                                               const gfx::FontList& font_list);
 
  private:
   class AutocompletePopupWidget;
 
   // views::View:
   const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
-  // This method should not be triggered directly as we paint our children
-  // in an un-conventional way inside OnPaint. We use a separate canvas to
-  // paint the children. Hence we override this method to a no-op so that
-  // the view hierarchy does not "accidentally" trigger this.
   void PaintChildren(gfx::Canvas* canvas,
                      const views::CullSet& cull_set) override;
 
   // views::ViewTargeterDelegate:
   views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
 
   // Call immediately after construction.
   void Init();
 
   // Returns true if the model has a match at the specified index.
   bool HasMatchAt(size_t index) const;
 
   // Returns the match at the specified index within the popup model.
   const AutocompleteMatch& GetMatchAtIndex(size_t index) const;
 
-  // Fill a path for the contents' roundrect. |bounding_rect| is the rect that
-  // bounds the path.
-  void MakeContentsPath(gfx::Path* path, const gfx::Rect& bounding_rect);
-
   // Find the index of the match under the given |point|, specified in window
   // coordinates. Returns OmniboxPopupModel::kNoMatch if there isn't a match at
   // the specified point.
   size_t GetIndexForPoint(const gfx::Point& point);
 
   // Processes a located event (e.g. mouse/gesture) and sets the selection/hover
   // state of a line in the list.
   void UpdateLineEvent(const ui::LocatedEvent& event,
                        bool should_set_selected_line);
 
@@ skipping 41 matching lines @@
 
   // When the dropdown is not wide enough while displaying postfix suggestions,
   // we use the width of widest match contents to shift the suggestions so that
   // the widest suggestion just reaches the end edge.
   int max_match_contents_width_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_