diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-19 01:57:22 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-19 01:57:22 +0000 |
| commit | cc36245af1ef3d4590a815d2a7133721817fdc6f (patch) | |
| tree | 1e2440bd1e9b7b348da2a2b0335d4ca962ceb470 /chrome/chrome_browser.gypi | |
| parent | d905e7a7d5efb36cfa2ac0e474ffe8fed5008017 (diff) | |
| download | chromium_src-cc36245af1ef3d4590a815d2a7133721817fdc6f.zip chromium_src-cc36245af1ef3d4590a815d2a7133721817fdc6f.tar.gz chromium_src-cc36245af1ef3d4590a815d2a7133721817fdc6f.tar.bz2 | |
Revert 50308: still failing on Linux sh-lib tests
Porting the infobars on Linux to the new TranslateInfobarDelegate2 (relanding)
Each translate infobar is now its own class and most of the logic is in the delegate.
Original review:
http://codereview.chromium.org/2836006/show
BUG=40828
TEST=Thoroughly test the translate feature on Linux.
Review URL: http://codereview.chromium.org/2817015
TBR=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/2863011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rwxr-xr-x | chrome/chrome_browser.gypi | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 5bbfca5..291f5dc 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1499,14 +1499,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', @@ -2290,6 +2284,8 @@ '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', @@ -2480,6 +2476,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', @@ -2807,9 +2805,6 @@ ], 'sources': [ 'browser/net/ssl_config_service_manager_system.cc', - # Mac is still using the older TranslateManager. - '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', |