diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 19:40:33 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 19:40:33 +0000 |
| commit | fb5153c5dd44a771be0cbd030a02eccf5cde76ed (patch) | |
| tree | f1533b6d48fc5d4bc88729cb4a7fa885ca6e7d1a /chrome/chrome.gyp | |
| parent | 7df4348513bd316224dbc1399990a2538c55a5bc (diff) | |
| download | chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.zip chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.tar.gz chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.tar.bz2 | |
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
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index d20f6f6..67391ed 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -606,8 +606,6 @@ 'browser/autocomplete/autocomplete_popup_view_gtk.h', 'browser/autocomplete/autocomplete_popup_view_mac.h', 'browser/autocomplete/autocomplete_popup_view_mac.mm', - 'browser/autocomplete/autocomplete_popup_view_win.cc', - 'browser/autocomplete/autocomplete_popup_view_win.h', 'browser/autocomplete/history_contents_provider.cc', 'browser/autocomplete/history_contents_provider.h', 'browser/autocomplete/history_url_provider.cc', @@ -1644,6 +1642,8 @@ 'browser/views/autocomplete/autocomplete_popup_contents_view.h', 'browser/views/autocomplete/autocomplete_popup_win.cc', 'browser/views/autocomplete/autocomplete_popup_win.h', + 'browser/views/autocomplete/autocomplete_popup_gtk.cc', + 'browser/views/autocomplete/autocomplete_popup_gtk.h', 'browser/views/blocked_popup_container_view_win.cc', 'browser/views/blocked_popup_container_view_win.h', 'browser/views/bookmark_bar_view.cc', @@ -1957,6 +1957,8 @@ ['OS=="linux" and toolkit_views==0', { 'sources!': [ 'browser/bookmarks/bookmark_drop_info.cc', + 'browser/views/autocomplete/autocomplete_popup_gtk.cc', + 'browser/views/autocomplete/autocomplete_popup_gtk.h' ], }], ['OS=="mac"', { @@ -2115,6 +2117,10 @@ ['include', '^browser/dock_info.cc'], ['include', '^browser/dock_info.h'], ['include', '^browser/extensions/'], + ['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.cc'], + ['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.h'], + ['include', '^browser/views/autocomplete/autocomplete_popup_gtk.cc'], + ['include', '^browser/views/autocomplete/autocomplete_popup_gtk.h'], ['include', '^browser/views/bookmark_bar_view.cc'], ['include', '^browser/views/bookmark_bar_view.h'], ['include', '^browser/views/bookmark_context_menu.cc'], @@ -2244,6 +2250,8 @@ ['include', '^browser/gtk/menu_gtk.h'], # Other excluded stuff. + ['exclude', '^browser/autocomplete/autocomplete_popup_view_gtk.cc'], + ['exclude', '^browser/autocomplete/autocomplete_popup_view_gtk.h'], ['exclude', '^browser/browser_theme_provider_gtk.cc'], ['exclude', '^browser/extensions/external_registry_extension_provider_win.cc'], ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], |