Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h

Issue 6469074: AutocompletePopupContentsView must override View::PaintChildren to prevent views (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: modified according to ocmments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
index 12088c7486430f2a1d3cb7a2486a300c5db56879..c1e81a7f9424ea793838b44f4e95598da0608a50 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
@@ -69,7 +69,12 @@ class AutocompletePopupContentsView : public views::View,
// Overridden from views::View:
virtual void OnPaint(gfx::Canvas* canvas);
- virtual void PaintChildren(gfx::CanvasSkia* canvas);
+
+ // 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 doesnot "accidentally" trigger this.
+ virtual void PaintChildren(gfx::Canvas* canvas);
virtual void Layout();
virtual void LayoutChildren();
virtual void OnMouseEntered(const views::MouseEvent& event);
@@ -81,6 +86,8 @@ class AutocompletePopupContentsView : public views::View,
virtual views::View* GetViewForPoint(const gfx::Point& point);
protected:
+ virtual void PaintResultViews(gfx::CanvasSkia* canvas);
+
// Calculates the height needed to show all the results in the model.
virtual int CalculatePopupHeight();
virtual AutocompleteResultView* CreateResultView(
« no previous file with comments | « no previous file | chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698