Make TOOLKIT_VIEWS port use views-based Autocomplete popup.

The popups now interact with the edit via AutocompleteEditView rather than the platform-specific types.

Note this also removes the old omnibox popup code. It hasn't been active for some time.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160378

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22168 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_view.h b/chrome/browser/autocomplete/autocomplete_popup_view.h
index 9ccb614..32cc0df 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view.h
@@ -19,7 +19,7 @@ namespace gfx {
 class Font;
 class Rect;
 }
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
 class AutocompleteEditViewWin;
 class AutocompleteEditModel;
 class Profile;
@@ -58,12 +58,12 @@ class AutocompletePopupView {
   // Returns the popup's model.
   virtual AutocompletePopupModel* GetModel() = 0;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   // Create a popup view implementation. It may make sense for this to become
   // platform independent eventually.
   static AutocompletePopupView* CreatePopupView(
       const gfx::Font& font,
-      AutocompleteEditViewWin* edit_view,
+      AutocompleteEditView* edit_view,
       AutocompleteEditModel* edit_model,
       Profile* profile,
       AutocompletePopupPositioner* popup_positioner);