summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 16:59:52 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 16:59:52 +0000
commit07539ee525bdb2ee619d0f571ffdc492aff54f0f (patch)
tree93f6174b2421f4e3853538704030a6cd80a1dae6 /chrome/chrome_tests.gypi
parent0e623c188f818c9bf61356a1043b2b709669ccde (diff)
downloadchromium_src-07539ee525bdb2ee619d0f571ffdc492aff54f0f.zip
chromium_src-07539ee525bdb2ee619d0f571ffdc492aff54f0f.tar.gz
chromium_src-07539ee525bdb2ee619d0f571ffdc492aff54f0f.tar.bz2
Revert 50465 - Porting the infobars on Linux to the new TranslateInfobarDelegate2.
Each translate infobar is now its own class and most of the logic is in the delegate. BUG=40828 TEST=Thoroughly test the translate feature on Linux. Review URL: http://codereview.chromium.org/2867017 TBR=jcivelli@chromium.org Review URL: http://codereview.chromium.org/2870019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rwxr-xr-xchrome/chrome_tests.gypi5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 096b827..0b6099b 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -970,6 +970,7 @@
'browser/tabs/tab_strip_model_unittest.cc',
'browser/task_manager_unittest.cc',
'browser/thumbnail_store_unittest.cc',
+ 'browser/translate/translate_manager_unittest.cc',
'browser/translate/translate_manager2_unittest.cc',
'browser/user_style_sheet_watcher_unittest.cc',
'browser/views/accessibility_event_router_views_unittest.cc',
@@ -1154,7 +1155,6 @@
],
'sources': [
'browser/spellchecker_platform_engine_unittest.cc',
- 'browser/translate/translate_manager_unittest.cc',
],
'sources!': [
# Blocked on bookmark manager.
@@ -1165,7 +1165,6 @@
'browser/views/accessibility_event_router_views_unittest.cc',
'browser/views/bookmark_bar_view_unittest.cc',
'browser/views/bookmark_context_menu_test.cc',
- 'browser/translate/translate_manager2_unittest.cc',
'tools/convert_dict/convert_dict_unittest.cc',
'../third_party/hunspell/google/hunspell_tests.cc',
],
@@ -1239,6 +1238,7 @@
],
'sources/': [
['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'],
+ ['exclude', 'browser/translate/translate_manager_unittest\\.cc$'],
],
'link_settings': {
'libraries': [
@@ -1270,6 +1270,7 @@
'browser/printing/print_job_unittest.cc',
'browser/rlz/rlz_unittest.cc',
'browser/search_engines/template_url_scraper_unittest.cc',
+ 'browser/translate/translate_manager2_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/extensions/browser_action_drag_data_unittest.cc',
'browser/views/find_bar_host_unittest.cc',