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 b8e0986e7e7f5d65088525685a4785991b0480d7..598b55bf951b8b06570998c28d5f9ed41b4a0dd8 100644 |
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h |
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h |
@@ -12,6 +12,7 @@ |
#include "chrome/browser/ui/views/autocomplete/autocomplete_result_view_model.h" |
#include "ui/base/animation/animation_delegate.h" |
#include "ui/base/animation/slide_animation.h" |
+#include "ui/gfx/canvas_skia.h" |
oshima
2011/02/16 20:00:27
isn't forward decl enough?
varunjain
2011/02/16 23:12:37
Done.
|
#include "ui/gfx/font.h" |
#include "views/view.h" |
#include "webkit/glue/window_open_disposition.h" |
@@ -69,10 +70,9 @@ class AutocompletePopupContentsView : public views::View, |
// Overridden from views::View: |
virtual void OnPaint(gfx::Canvas* canvas); |
- virtual void PaintChildren(gfx::Canvas* canvas) { |
- // We paint our children inside OnPaint(). |
- } |
+ virtual void PaintChildren(gfx::CanvasSkia* canvas); |
virtual void Layout(); |
+ virtual void LayoutChildren(); |
virtual void OnMouseEntered(const views::MouseEvent& event); |
virtual void OnMouseMoved(const views::MouseEvent& event); |
virtual void OnMouseExited(const views::MouseEvent& event); |
@@ -90,6 +90,12 @@ class AutocompletePopupContentsView : public views::View, |
const gfx::Font& font, |
const gfx::Font& bold_font); |
+ // The provider of our result set. |
Peter Kasting
2011/02/16 21:50:22
Nit: No need for this comment
varunjain
2011/02/16 23:12:37
Done.
|
+ scoped_ptr<AutocompletePopupModel> model_; |
+ |
+ // If non-NULL the instant opt-in-view is visible. |
Peter Kasting
2011/02/16 21:50:22
Nit: How about:
// The "Opt-in to Instant" promo
varunjain
2011/02/16 23:12:37
Done.
|
+ views::View* opt_in_view_; |
+ |
private: |
#if defined(OS_WIN) |
typedef AutocompletePopupWin AutocompletePopupClass; |
@@ -136,9 +142,6 @@ class AutocompletePopupContentsView : public views::View, |
// deleted, or without our knowledge. |
base::WeakPtr<AutocompletePopupClass> popup_; |
- // The provider of our result set. |
- scoped_ptr<AutocompletePopupModel> model_; |
- |
// The edit view that invokes us. |
AutocompleteEditView* edit_view_; |
@@ -169,9 +172,6 @@ class AutocompletePopupContentsView : public views::View, |
gfx::Rect start_bounds_; |
gfx::Rect target_bounds_; |
- // If non-NULL the instant opt-in-view is visible. |
- views::View* opt_in_view_; |
- |
DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView); |
}; |