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

Side by Side Diff: chrome/browser/ui/translate/language_combobox_model.cc

Issue 25373009: Translate: New Bubble UX (for the view toolkit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: view id on tests Created 7 years, 1 month 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
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/translate/language_combobox_model.h" 5 #include "chrome/browser/ui/translate/language_combobox_model.h"
6 6
7 #include "chrome/browser/ui/translate/translate_bubble_model.h" 7 #include "chrome/browser/ui/translate/translate_bubble_model.h"
8 8
9 LanguageComboboxModel::LanguageComboboxModel( 9 LanguageComboboxModel::LanguageComboboxModel(
10 int default_index, 10 int default_index,
11 TranslateBubbleModel* model) 11 TranslateBubbleModel* model)
12 : default_index_(default_index), 12 : default_index_(default_index < 0 ? 0 : default_index),
13 model_(model) { 13 model_(model) {
14 // view::Combobox can't treate an negative index, but |default_index| can be
15 // negative when, for example, the page's language can't be detected.
14 } 16 }
15 17
16 LanguageComboboxModel::~LanguageComboboxModel() { 18 LanguageComboboxModel::~LanguageComboboxModel() {
17 } 19 }
18 20
19 int LanguageComboboxModel::GetItemCount() const { 21 int LanguageComboboxModel::GetItemCount() const {
20 return model_->GetNumberOfLanguages(); 22 return model_->GetNumberOfLanguages();
21 } 23 }
22 24
23 string16 LanguageComboboxModel::GetItemAt(int index) { 25 string16 LanguageComboboxModel::GetItemAt(int index) {
24 return model_->GetLanguageNameAt(index); 26 return model_->GetLanguageNameAt(index);
25 } 27 }
26 28
27 bool LanguageComboboxModel::IsItemSeparatorAt(int index) { 29 bool LanguageComboboxModel::IsItemSeparatorAt(int index) {
28 return false; 30 return false;
29 } 31 }
30 32
31 int LanguageComboboxModel::GetDefaultIndex() const { 33 int LanguageComboboxModel::GetDefaultIndex() const {
32 return default_index_; 34 return default_index_;
33 } 35 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/view_id_util_browsertest.cc ('k') | chrome/browser/ui/translate/translate_bubble_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698