Create a new autocomplete popup for touch. This CL depends on

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h

 // Copyright (c) 2011 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_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #pragma once
 
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
+#include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/canvas_skia.h"
 #include "views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h"
 #else
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.h"
 #endif
 
 class AutocompleteEditModel;
 class AutocompleteEditViewWin;
 struct AutocompleteMatch;
 class BubbleBorder;
 class Profile;
 
-// An interface implemented by an object that provides data to populate
-// individual result views.
-class AutocompleteResultViewModel {
- public:
-  // Returns true if the index is selected.
-  virtual bool IsSelectedIndex(size_t index) const = 0;
-
-  // Returns true if the index is hovered.
-  virtual bool IsHoveredIndex(size_t index) const = 0;
-
-  // Returns the special-case icon we should use for the given index, or NULL
-  // if we should use the default icon.
-  virtual const SkBitmap* GetSpecialIcon(size_t index) const = 0;
-};
+namespace gfx {
+class Insets;
+}
 
 // A view representing the contents of the autocomplete popup.
 class AutocompletePopupContentsView : public views::View,
                                       public AutocompleteResultViewModel,
                                       public AutocompletePopupView,
                                       public ui::AnimationDelegate {
  public:
   AutocompletePopupContentsView(const gfx::Font& font,
                                 AutocompleteEditView* edit_view,
                                 AutocompleteEditModel* edit_model,
                                 Profile* profile,
                                 const views::View* location_bar);
   virtual ~AutocompletePopupContentsView();
 
+  AutocompletePopupModel* model() { return model_.get(); }

[Peter Kasting, 2011/02/16 00:50:35]

Do we need these public accessors?  Wouldn't simply making the members be
protected suffice?

[varunjain, 2011/02/16 18:48:10]

Done.

+  views::View* opt_in_view() { return opt_in_view_; }
+
   // Returns the bounds the popup should be shown at. This is the display bounds
   // and includes offsets for the dropshadow which this view's border renders.
   gfx::Rect GetPopupBounds() const;
 
   // Overridden from AutocompletePopupView:
   virtual bool IsOpen() const;
   virtual void InvalidateLine(size_t line);
   virtual void UpdatePopupAppearance();
   virtual gfx::Rect GetTargetBounds();
   virtual void PaintUpdatesNow();
   virtual void OnDragCanceled();
   virtual AutocompletePopupModel* GetModel();
 
   // Overridden from AutocompleteResultViewModel:
   virtual bool IsSelectedIndex(size_t index) const;
   virtual bool IsHoveredIndex(size_t index) const;
   virtual const SkBitmap* GetSpecialIcon(size_t index) const;
 
   // Overridden from ui::AnimationDelegate:
   virtual void AnimationProgressed(const ui::Animation* animation);
 
   // Overridden from views::View:
   virtual void Paint(gfx::Canvas* canvas);
-  virtual void PaintChildren(gfx::Canvas* canvas) {
-    // We paint our children inside Paint().
-  }
+  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);
   virtual bool OnMousePressed(const views::MouseEvent& event);
   virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
   virtual bool OnMouseDragged(const views::MouseEvent& event);
   virtual views::View* GetViewForPoint(const gfx::Point& point);
 
+ protected:
+  // Calculates the height needed to show all the results in the model.
+  virtual int CalculatePopupHeight();
+  virtual AutocompleteResultView* CreateResultView(
+      AutocompleteResultViewModel* model,
+      int model_index,
+      const gfx::Font& font,
+      const gfx::Font& bold_font);
+
  private:
 #if defined(OS_WIN)
   typedef AutocompletePopupWin AutocompletePopupClass;
 #else
   typedef AutocompletePopupGtk AutocompletePopupClass;
 #endif
   class InstantOptInView;
 
   // Returns true if the model has a match at the specified index.
   bool HasMatchAt(size_t index) const;
@@ skipping 66 matching lines @@
   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);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_