summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.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_browser.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_browser.gypi')
-rwxr-xr-xchrome/chrome_browser.gypi21
1 files changed, 8 insertions, 13 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cd71d7f..5ede262 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1508,14 +1508,8 @@
'browser/gtk/task_manager_gtk.h',
'browser/gtk/theme_install_bubble_view_gtk.cc',
'browser/gtk/theme_install_bubble_view_gtk.h',
- 'browser/gtk/translate/after_translate_infobar_gtk.cc',
- 'browser/gtk/translate/after_translate_infobar_gtk.h',
- 'browser/gtk/translate/before_translate_infobar_gtk.cc',
- 'browser/gtk/translate/before_translate_infobar_gtk.h',
- 'browser/gtk/translate/translate_infobar_base_gtk.cc',
- 'browser/gtk/translate/translate_infobar_base_gtk.h',
- 'browser/gtk/translate/translate_message_infobar_gtk.cc',
- 'browser/gtk/translate/translate_message_infobar_gtk.h',
+ 'browser/gtk/translate_infobars.cc',
+ 'browser/gtk/translate_infobars.h',
'browser/gtk/update_recommended_dialog.cc',
'browser/gtk/update_recommended_dialog.h',
'browser/gtk/view_id_util.cc',
@@ -2299,8 +2293,12 @@
'browser/translate/options_menu_model2.cc',
'browser/translate/options_menu_model2.h',
'browser/translate/translate_infobar_view.h',
+ 'browser/translate/translate_infobars_delegates.cc',
+ 'browser/translate/translate_infobars_delegates.h',
'browser/translate/translate_infobar_delegate2.cc',
'browser/translate/translate_infobar_delegate2.h',
+ 'browser/translate/translate_manager.cc',
+ 'browser/translate/translate_manager.h',
'browser/translate/translate_manager2.cc',
'browser/translate/translate_manager2.h',
'browser/translate/translate_prefs.cc',
@@ -2487,6 +2485,8 @@
'browser/views/infobars/infobar_text_button.h',
'browser/views/infobars/infobars.cc',
'browser/views/infobars/infobars.h',
+ 'browser/views/infobars/translate_infobars.cc',
+ 'browser/views/infobars/translate_infobars.h',
'browser/views/infobars/translate_infobar_base.cc',
'browser/views/infobars/translate_infobar_base.h',
'browser/views/infobars/translate_message_infobar.cc',
@@ -2816,11 +2816,6 @@
],
'sources': [
'browser/net/ssl_config_service_manager_system.cc',
- # Mac is still using the older TranslateManager.
- 'browser/translate/translate_manager.cc',
- 'browser/translate/translate_manager.h',
- 'browser/translate/translate_infobars_delegates.cc',
- 'browser/translate/translate_infobars_delegates.h',
# Build Apple sample code
'../third_party/apple/ImageAndTextCell.h',
'../third_party/apple/ImageAndTextCell.m',