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"
@@ skipping 12 matching lines @@
 #endif
 
 class AutocompleteEditModel;
 class AutocompleteEditViewWin;
 struct AutocompleteMatch;
 class AutocompleteResultView;
 class BubbleBorder;
 class Profile;
 
 namespace gfx {
+class CanvasSkia;
 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,
@@ skipping 18 matching lines @@
   // 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 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);
   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);
 
+  scoped_ptr<AutocompletePopupModel> model_;
+
+  // The "Opt-in to Instant" promo view, if there is one.
+  views::View* opt_in_view_;
+
  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 26 matching lines @@
   // Invoked if the user clicks on one of the opt-in buttons. Removes the opt-in
   // view.
   void UserPressedOptIn(bool opt_in);
 
   // The popup that contains this view.  We create this, but it deletes itself
   // when its window is destroyed.  This is a WeakPtr because it's possible for
   // the OS to destroy the window and thus delete this object before we're
   // 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_;
 
   // An object that the popup positions itself against.
   const views::View* location_bar_;
 
   // Our border, which can compute our desired bounds.
   const BubbleBorder* bubble_border_;
 
   // The font that we should use for result rows. This is based on the font used
@@ skipping 10 matching lines @@
   // flag is reset to false on a mouse pressed event, to make sure we don't
   // erroneously ignore the next drag.
   bool ignore_mouse_drag_;
 
   // The popup sizes vertically using an animation when the popup is getting
   // shorter (not larger, that makes it look "slow").
   ui::SlideAnimation size_animation_;
   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_