diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 22:06:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 22:06:19 +0000 |
| commit | 44f773c63bbe33388c71bac110e097a0bf106664 (patch) | |
| tree | 1996d8ceee903a7061c4dddd8fbba43c3570ff03 /chrome/chrome.gyp | |
| parent | 22a3daa444d2ef3efd1e11fdcd6216c0f5b474a5 (diff) | |
| download | chromium_src-44f773c63bbe33388c71bac110e097a0bf106664.zip chromium_src-44f773c63bbe33388c71bac110e097a0bf106664.tar.gz chromium_src-44f773c63bbe33388c71bac110e097a0bf106664.tar.bz2 | |
Refactored FindBarHost/View to create DropdownBarHostView, which I'm plannig to use this
for CompactLocationBar.
BUG=None
TEST=enabled find_bar_host_browsertest.cc for linux view build.
Review URL: http://codereview.chromium.org/360044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 0e800ce..c778347 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -81,6 +81,9 @@ 'browser/privacy_blacklist/blacklist_manager_browsertest.cc', 'browser/ssl/ssl_browser_tests.cc', ], + 'browser_tests_sources_views_specific': [ + 'browser/views/find_bar_host_browsertest.cc', + ], 'browser_tests_sources_win_specific': [ 'browser/extensions/browser_action_apitest.cc', 'browser/extensions/extension_devtools_browsertest.cc', @@ -92,8 +95,6 @@ 'browser/extensions/extension_tabs_apitest.cc', 'browser/extensions/extension_i18n_apitest.cc', 'browser/extensions/extension_popup_apitest.cc', - 'browser/views/browser_views_accessibility_browsertest.cc', - 'browser/views/find_bar_host_browsertest.cc', # TODO(jam): http://crbug.com/15101 These tests fail on Linux and Mac. 'browser/child_process_security_policy_browser_test.cc', 'browser/renderer_host/test/web_cache_manager_browsertest.cc', @@ -101,6 +102,7 @@ # TODO(jcampan): once the task manager works on Mac, move this test to the # non win specific section. 'browser/task_manager_browsertest.cc', + 'browser/views/browser_views_accessibility_browsertest.cc', ], 'browser_tests_sources_exclude_on_mac': [ 'browser/extensions/cross_origin_xhr_apitest.cc', @@ -2283,6 +2285,11 @@ 'browser/views/download_shelf_view.cc', 'browser/views/download_shelf_view.h', 'browser/views/download_started_animation_win.cc', + 'browser/views/dropdown_bar_host.cc', + 'browser/views/dropdown_bar_host.h', + 'browser/views/dropdown_bar_host_gtk.cc', + 'browser/views/dropdown_bar_host_win.cc', + 'browser/views/dropdown_bar_view.h', 'browser/views/edit_search_engine_dialog.cc', 'browser/views/edit_search_engine_dialog.h', 'browser/views/event_utils.cc', @@ -2815,6 +2822,10 @@ ['include', '^browser/views/download_shelf_view.h'], ['include', '^browser/views/dragged_tab_controller.cc'], ['include', '^browser/views/dragged_tab_controller.h'], + ['include', '^browser/views/dropdown_bar_host.cc'], + ['include', '^browser/views/dropdown_bar_host.h'], + ['include', '^browser/views/dropdown_bar_host_gtk.cc'], + ['include', '^browser/views/dropdown_bar_view.h'], ['include', '^browser/views/event_utils.cc'], ['include', '^browser/views/event_utils.h'], ['include', '^browser/views/extensions/extension_install_prompt.cc'], @@ -6444,6 +6455,11 @@ '../views/views.gyp:views', ], }], + ['OS=="linux" and toolkit_views==1', { + 'sources': [ + '<@(browser_tests_sources_views_specific)', + ], + }], ['OS=="mac"', { 'sources': [ 'app/breakpad_mac_stubs.mm', @@ -6763,6 +6779,7 @@ # defined in 'variables' at the top of the file. '<@(browser_tests_sources)', '<@(browser_tests_sources_win_specific)', + '<@(browser_tests_sources_views_specific)', ], 'conditions': [ ['OS=="win"', { |