| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" | 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 std::vector<base::string16> items( | 635 std::vector<base::string16> items( |
| 636 static_cast<size_t>(DenialComboboxIndex::MENU_SIZE)); | 636 static_cast<size_t>(DenialComboboxIndex::MENU_SIZE)); |
| 637 items[static_cast<size_t>(DenialComboboxIndex::DONT_TRANSLATE)] = | 637 items[static_cast<size_t>(DenialComboboxIndex::DONT_TRANSLATE)] = |
| 638 l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_DENY); | 638 l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_DENY); |
| 639 items[static_cast<size_t>(DenialComboboxIndex::NEVER_TRANSLATE_LANGUAGE)] = | 639 items[static_cast<size_t>(DenialComboboxIndex::NEVER_TRANSLATE_LANGUAGE)] = |
| 640 l10n_util::GetStringFUTF16(IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_LANG, | 640 l10n_util::GetStringFUTF16(IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_LANG, |
| 641 original_language_name); | 641 original_language_name); |
| 642 items[static_cast<size_t>(DenialComboboxIndex::NEVER_TRANSLATE_SITE)] = | 642 items[static_cast<size_t>(DenialComboboxIndex::NEVER_TRANSLATE_SITE)] = |
| 643 l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_SITE); | 643 l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_SITE); |
| 644 denial_combobox_model_.reset(new ui::SimpleComboboxModel(items)); | 644 denial_combobox_model_.reset(new ui::SimpleComboboxModel(items)); |
| 645 denial_combobox_ = new views::Combobox(denial_combobox_model_.get()); | 645 denial_combobox_ = new views::Combobox(denial_combobox_model_.get(), |
| 646 views::Combobox::STYLE_ACTION); |
| 646 denial_combobox_->set_id(COMBOBOX_ID_DENIAL); | 647 denial_combobox_->set_id(COMBOBOX_ID_DENIAL); |
| 647 denial_combobox_->set_listener(this); | 648 denial_combobox_->set_listener(this); |
| 648 denial_combobox_->SetStyle(views::Combobox::STYLE_ACTION); | |
| 649 layout->AddView(denial_combobox_); | 649 layout->AddView(denial_combobox_); |
| 650 } | 650 } |
| 651 | 651 |
| 652 return view; | 652 return view; |
| 653 } | 653 } |
| 654 | 654 |
| 655 views::View* TranslateBubbleView::CreateViewTranslating() { | 655 views::View* TranslateBubbleView::CreateViewTranslating() { |
| 656 base::string16 target_language_name = | 656 base::string16 target_language_name = |
| 657 model_->GetLanguageNameAt(model_->GetTargetLanguageIndex()); | 657 model_->GetLanguageNameAt(model_->GetTargetLanguageIndex()); |
| 658 views::Label* label = new views::Label( | 658 views::Label* label = new views::Label( |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 base::string16 label; | 937 base::string16 label; |
| 938 if (model_->IsPageTranslatedInCurrentLanguages()) | 938 if (model_->IsPageTranslatedInCurrentLanguages()) |
| 939 label = l10n_util::GetStringUTF16(IDS_DONE); | 939 label = l10n_util::GetStringUTF16(IDS_DONE); |
| 940 else | 940 else |
| 941 label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT); | 941 label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT); |
| 942 advanced_done_button_->SetText(label); | 942 advanced_done_button_->SetText(label); |
| 943 advanced_done_button_->SizeToPreferredSize(); | 943 advanced_done_button_->SizeToPreferredSize(); |
| 944 if (advanced_view_) | 944 if (advanced_view_) |
| 945 advanced_view_->Layout(); | 945 advanced_view_->Layout(); |
| 946 } | 946 } |
| OLD | NEW |