Address some TODOs for ChooserBubbleDelegate class

chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
@@ skipping 104 matching lines @@
 class ChooserTableModel : public ui::TableModel,
                           public ChooserBubbleDelegate::Observer {
  public:
   explicit ChooserTableModel(ChooserBubbleDelegate* chooser_bubble_delegate)
       : observer_(nullptr), chooser_bubble_delegate_(chooser_bubble_delegate) {
     chooser_bubble_delegate_->set_observer(this);
   }
 
   // ui::TableModel:
   int RowCount() override {
-    const std::vector<base::string16>& device_names =
-        chooser_bubble_delegate_->GetOptions();
-    if (device_names.empty()) {
-      // Here it returns 1 when there is no device. In this case, the
-      // table view still needs to display a text message saying no
-      // devices found, so the number of rows is 1.
-      return 1;
-    } else {
-      return static_cast<int>(device_names.size());
-    }
+    size_t num_options = chooser_bubble_delegate_->NumOptions();
+    // Here it returns 1 when there is no device. In this case, the
+    // table view still needs to display a text message saying no
+    // devices found, so the number of rows is 1.
+    return num_options == 0 ? 1 : static_cast<int>(num_options);
   }
 
   // ui::TableModel:
   base::string16 GetText(int row, int column_id) override {
-    const std::vector<base::string16>& device_names =
-        chooser_bubble_delegate_->GetOptions();
-    if (device_names.empty()) {
+    size_t num_options = chooser_bubble_delegate_->NumOptions();
+    if (num_options == 0) {
       DCHECK(row == 0);
       return l10n_util::GetStringUTF16(
           IDS_CHOOSER_BUBBLE_NO_DEVICES_FOUND_PROMPT);
-    } else if (row >= 0 && row < static_cast<int>(device_names.size())) {
-      return device_names[row];
+    } else if (row >= 0 && row < static_cast<int>(num_options)) {
+      return chooser_bubble_delegate_->GetOption(static_cast<size_t>(row));
     } else {
       NOTREACHED();
       return base::string16();
     }
   }
 
   // ui::TableModel:
   void SetObserver(ui::TableModelObserver* observer) override {
     observer_ = observer;
   }
 
   // ChooserOptions::Observer:
   void OnOptionsInitialized() override {
     if (observer_) {
       observer_->OnModelChanged();
       Update();
     }
   }
 
   // ChooserOptions::Observer:
-  void OnOptionAdded(int index) override {
+  void OnOptionAdded(size_t index) override {
     if (observer_) {
-      observer_->OnItemsAdded(index, 1);
+      observer_->OnItemsAdded(static_cast<int>(index), 1);
       Update();
     }
   }
 
   // ChooserOptions::Observer:
-  void OnOptionRemoved(int index) override {
+  void OnOptionRemoved(size_t index) override {
     if (observer_) {
-      observer_->OnItemsRemoved(index, 1);
+      observer_->OnItemsRemoved(static_cast<int>(index), 1);
       Update();
     }
   }
 
   void Update() {
     views::TableView* table_view = static_cast<views::TableView*>(observer_);
 
-    if (chooser_bubble_delegate_->GetOptions().empty()) {
+    if (chooser_bubble_delegate_->NumOptions() == 0) {
       observer_->OnModelChanged();
       table_view->SetEnabled(false);
     } else {
       table_view->SetEnabled(true);
     }
   }
 
   void SetConnectButton(views::LabelButton* connect_button) {
     connect_button_ = connect_button;
   }
@@ skipping 29 matching lines @@
   chooser_table_model_ = new ChooserTableModel(chooser_bubble_delegate_);
   table_view_ = new views::TableView(chooser_table_model_, table_columns,
                                      views::TEXT_ONLY, true);
   table_view_->set_select_on_remove(false);
   chooser_table_model_->SetObserver(table_view_);
   table_view_->SetObserver(this);
   layout->AddView(table_view_->CreateParentIfNecessary(), 1, 1,
                   views::GridLayout::FILL, views::GridLayout::FILL,
                   kChooserPermissionBubbleWidth,
                   kChooserPermissionBubbleHeight);
-  if (chooser_bubble_delegate_->GetOptions().empty()) {
+  if (chooser_bubble_delegate_->NumOptions() == 0) {
     table_view_->SetEnabled(false);
   }
 
   layout->AddPaddingRow(0, kItemMajorSpacing);
 
   views::View* button_row = new views::View();
   views::GridLayout* button_layout = new views::GridLayout(button_row);
   views::ColumnSet* button_columns = button_layout->AddColumnSet(0);
   button_row->SetLayoutManager(button_layout);
   layout->StartRow(1, 0);
@@ skipping 152 matching lines @@
     return browser_view->exclusive_access_bubble()->GetView();
 
   return browser_view->top_container();
 }
 
 views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
   if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return views::BubbleBorder::TOP_LEFT;
   return views::BubbleBorder::NONE;
 }