diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 18:53:38 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 18:53:38 +0000 |
| commit | bd6dec7407bcacd66a3cb4adbc33fab42214a36d (patch) | |
| tree | 30c62fdee0606ef3d3c3f9370f0a936650a92a0a /chrome/browser/views/infobars/translate_infobars.cc | |
| parent | b05ce36f883bb46bf7bd78a235b1e979ed1add86 (diff) | |
| download | chromium_src-bd6dec7407bcacd66a3cb4adbc33fab42214a36d.zip chromium_src-bd6dec7407bcacd66a3cb4adbc33fab42214a36d.tar.gz chromium_src-bd6dec7407bcacd66a3cb4adbc33fab42214a36d.tar.bz2 | |
Translate Infobars for OS X.
Infobars.xib changes - Connect and fix class for close button since the translate infobar needs to know where it is to position the "Options" menu to it's left.
BUG=34466
TEST=Translate infobars should continue to workon Windows.
Review URL: http://codereview.chromium.org/594056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/infobars/translate_infobars.cc')
| -rw-r--r-- | chrome/browser/views/infobars/translate_infobars.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/infobars/translate_infobars.cc b/chrome/browser/views/infobars/translate_infobars.cc index 1723c4b..fca63f5 100644 --- a/chrome/browser/views/infobars/translate_infobars.cc +++ b/chrome/browser/views/infobars/translate_infobars.cc @@ -719,7 +719,8 @@ void TranslateInfoBar::OnLanguageModified(views::MenuButton* menu_button, SchedulePaint(); // Clear options menu model so that it'll be created with new language. options_menu_model_.reset(); - // If necessary, trigger translation. + // Selecting an item from the "from language" menu in the before translate + // phase shouldn't trigger translation - http://crbug.com/36666 if (GetDelegate()->state() == TranslateInfoBarDelegate::kAfterTranslate) GetDelegate()->Translate(); } |