Re-land:

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_model.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/font.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"
-#elif defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.h"
-#endif
-
 class AutocompleteEditModel;
 struct AutocompleteMatch;
 class AutocompleteResultView;
 class BubbleBorder;
 class Profile;
 
 namespace gfx {
 class CanvasSkia;
 class Insets;
 }
@@ skipping 63 matching lines @@
   // paint the children. Hence we override this method to a no-op so that
   // the view hierarchy does not "accidentally" trigger this.
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
 
   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;
-#elif defined(TOOLKIT_USES_GTK)
-  typedef AutocompletePopupGtk AutocompletePopupClass;
-#endif
+  class AutocompletePopupWidget;
   class InstantOptInView;
 
   // Returns true if the model has a match at the specified index.
   bool HasMatchAt(size_t index) const;
 
   // Returns the match at the specified index within the popup model.
   const AutocompleteMatch& GetMatchAtIndex(size_t index) const;
 
   // Fill a path for the contents' roundrect. |bounding_rect| is the rect that
   // bounds the path.
@@ skipping 18 matching lines @@
   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
   // deleted, or without our knowledge.
-  base::WeakPtr<AutocompletePopupClass> popup_;
+  base::WeakPtr<AutocompletePopupWidget> popup_;
 
   // The edit view that invokes us.
   OmniboxView* omnibox_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_;
 
@@ skipping 15 matching lines @@
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_