Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: chrome/browser/ui/views/translate/translate_bubble_view.cc

Issue 1310903004: Use a ui::MenuModel in views::Combobox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +curlies Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/controls/combobox/combobox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 421
422 views::View* TranslateBubbleView::CreateViewBeforeTranslate() { 422 views::View* TranslateBubbleView::CreateViewBeforeTranslate() {
423 views::Label* message_label = new views::Label( 423 views::Label* message_label = new views::Label(
424 l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_BEFORE_TRANSLATE)); 424 l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_BEFORE_TRANSLATE));
425 425
426 base::string16 original_language_name = 426 base::string16 original_language_name =
427 model_->GetLanguageNameAt(model_->GetOriginalLanguageIndex()); 427 model_->GetLanguageNameAt(model_->GetOriginalLanguageIndex());
428 428
429 std::vector<base::string16> items; 429 std::vector<base::string16> items;
430 items.push_back(l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_DENY)); 430 items.push_back(l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_DENY));
431 items.push_back(base::string16());
432 items.push_back(l10n_util::GetStringFUTF16( 431 items.push_back(l10n_util::GetStringFUTF16(
433 IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_LANG, 432 IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_LANG,
434 original_language_name)); 433 original_language_name));
435 items.push_back(base::string16()); 434 items.push_back(base::string16());
436 items.push_back(l10n_util::GetStringUTF16( 435 items.push_back(l10n_util::GetStringUTF16(
437 IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_SITE)); 436 IDS_TRANSLATE_BUBBLE_NEVER_TRANSLATE_SITE));
438 437
439 denial_combobox_model_.reset(new ui::SimpleComboboxModel(items)); 438 denial_combobox_model_.reset(new ui::SimpleComboboxModel(items));
440 denial_combobox_ = new views::Combobox(denial_combobox_model_.get()); 439 denial_combobox_ = new views::Combobox(denial_combobox_model_.get());
441 denial_combobox_->set_id(COMBOBOX_ID_DENIAL); 440 denial_combobox_->set_id(COMBOBOX_ID_DENIAL);
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 base::string16 label; 760 base::string16 label;
762 if (model_->IsPageTranslatedInCurrentLanguages()) 761 if (model_->IsPageTranslatedInCurrentLanguages())
763 label = l10n_util::GetStringUTF16(IDS_DONE); 762 label = l10n_util::GetStringUTF16(IDS_DONE);
764 else 763 else
765 label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT); 764 label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT);
766 advanced_done_button_->SetText(label); 765 advanced_done_button_->SetText(label);
767 advanced_done_button_->SizeToPreferredSize(); 766 advanced_done_button_->SizeToPreferredSize();
768 if (advanced_view_) 767 if (advanced_view_)
769 advanced_view_->Layout(); 768 advanced_view_->Layout();
770 } 769 }
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/combobox/combobox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698