diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:31:01 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:31:01 +0000 |
commit | 168a71dcdbde91f44b9d8673951366786ff5182f (patch) | |
tree | 6ebbbac81664bd32b758431865f84e8615094f60 /chrome/browser/views | |
parent | bc8f69e0e1ea11ab908b4a59c0c6b794590f3bde (diff) | |
download | chromium_src-168a71dcdbde91f44b9d8673951366786ff5182f.zip chromium_src-168a71dcdbde91f44b9d8673951366786ff5182f.tar.gz chromium_src-168a71dcdbde91f44b9d8673951366786ff5182f.tar.bz2 |
Second attempt to land this. This time it compiles on windows, too.
Resuscitate the TOOLKIT_VIEWS build by disabling stuff we don't build yet.
TBR=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/141012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h index 40d6f69..0b6e4c4 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h @@ -9,12 +9,15 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" +#if defined(OS_WIN) #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" +#endif #include "views/view.h" #include "webkit/glue/window_open_disposition.h" class AutocompleteEditModel; class AutocompleteEditViewWin; +class AutocompletePopupWin; class Profile; // An interface implemented by an object that provides data to populate @@ -91,8 +94,10 @@ class AutocompletePopupContentsView : public views::View, // Makes the contents of the canvas slightly transparent. void MakeCanvasTransparent(gfx::Canvas* canvas); +#if defined(OS_WIN) // The popup that contains this view. scoped_ptr<AutocompletePopupWin> popup_; +#endif // The provider of our result set. scoped_ptr<AutocompletePopupModel> model_; |