Chromium Code Reviews| Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h |
| diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h |
| index f8130cb0c4b6d513a3cd925e19a654aa0cb28633..b070ee21cc049848748c61f56ea4f5a2467095fe 100644 |
| --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h |
| +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h |
| @@ -40,7 +40,7 @@ class OmniboxPopupContentsView : public views::View, |
| virtual void LayoutChildren(); |
| - // Overridden from OmniboxPopupView: |
| + // OmniboxPopupView: |
| bool IsOpen() const override; |
| void InvalidateLine(size_t line) override; |
| void UpdatePopupAppearance() override; |
| @@ -48,10 +48,10 @@ class OmniboxPopupContentsView : public views::View, |
| void PaintUpdatesNow() override; |
| void OnDragCanceled() override; |
| - // Overridden from gfx::AnimationDelegate: |
| + // gfx::AnimationDelegate: |
| void AnimationProgressed(const gfx::Animation* animation) override; |
| - // Overridden from views::View: |
| + // views::View: |
| void Layout() override; |
| views::View* GetTooltipHandlerForPoint(const gfx::Point& point) override; |
| bool OnMousePressed(const ui::MouseEvent& event) override; |
| @@ -62,7 +62,7 @@ class OmniboxPopupContentsView : public views::View, |
| void OnMouseEntered(const ui::MouseEvent& event) override; |
| void OnMouseExited(const ui::MouseEvent& event) override; |
| - // Overridden from ui::EventHandler: |
| + // ui::EventHandler: |
|
Peter Kasting
2015/01/24 02:20:59
Nit: Just nuke this heading and the blank line abo
oshima
2015/01/26 19:48:18
Done.
|
| void OnGestureEvent(ui::GestureEvent* event) override; |
| bool IsSelectedIndex(size_t index) const; |
| @@ -90,7 +90,11 @@ class OmniboxPopupContentsView : public views::View, |
| virtual OmniboxResultView* CreateResultView(int model_index, |
| const gfx::FontList& font_list); |
| - // Overridden from views::View: |
| + 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 |
| @@ -101,9 +105,6 @@ class OmniboxPopupContentsView : public views::View, |
| scoped_ptr<OmniboxPopupModel> model_; |
|
Peter Kasting
2015/01/24 02:20:59
Nit: Move down to with other members
oshima
2015/01/26 19:48:18
Done.
|
| - private: |
| - class AutocompletePopupWidget; |
| - |
| // views::ViewTargeterDelegate: |
| views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override; |