Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 8 insertions, 1 deletions

diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
index 5253004..2924ce2 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
@@ -65,7 +65,6 @@ class AutocompletePopupContentsView : public views::View,
   virtual void PaintUpdatesNow();
   virtual void OnDragCanceled();
   virtual AutocompletePopupModel* GetModel();
-  virtual int GetMaxYCoordinate();
 
   // Overridden from AutocompleteResultViewModel:
   virtual bool IsSelectedIndex(size_t index) const;
@@ -95,6 +94,7 @@ class AutocompletePopupContentsView : public views::View,
 #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;
@@ -124,6 +124,10 @@ class AutocompletePopupContentsView : public views::View,
   // Returns the target bounds given the specified content height.
   gfx::Rect CalculateTargetBounds(int h);
 
+  // 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
@@ -163,6 +167,9 @@ 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);
 };