Address some TODOs for ChooserBubbleDelegate class

chrome/browser/ui/website_settings/chooser_bubble_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_DELEGATE_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_DELEGATE_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 17 matching lines @@
   explicit ChooserBubbleDelegate(Browser* browser);
   ~ChooserBubbleDelegate() override;
 
   // Since the set of options can change while the UI is visible an
   // implementation should register an observer.
   class Observer {
    public:
     // Called after the options list is initialized for the first time.
     // OnOptionsInitialized should only be called once.
     virtual void OnOptionsInitialized() = 0;
-    // Called after GetOptions()[index] has been added to the options and the
+    // Called after GetOption(index) has been added to the options and the

[Peter Kasting, 2016/01/04 21:02:52]

Nit: Everywhere in this file: Please put a blank line above a function comment
like this, so the comment + function are visually distinct from the previous
function.

[juncai, 2016/01/04 22:44:47]

Done.

     // newly added option is the last element in the options list. Calling
-    // GetOptions()[index] from inside a call to OnOptionAdded will see the
+    // GetOption(index) from inside a call to OnOptionAdded will see the
     // added string since the options have already been updated.
-    virtual void OnOptionAdded(int index) = 0;
-    // Called when GetOptions()[index] is no longer present, and all later
-    // options have been moved earlier by 1 slot. Calling GetOptions()[index]
+    virtual void OnOptionAdded(size_t index) = 0;
+    // Called when GetOption(index) is no longer present, and all later
+    // options have been moved earlier by 1 slot. Calling GetOption(index)
     // from inside a call to OnOptionRemoved will NOT see the removed string
     // since the options have already been updated.
-    virtual void OnOptionRemoved(int index) = 0;
+    virtual void OnOptionRemoved(size_t index) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   // BubbleDelegate:
   std::string GetName() const override;
   scoped_ptr<BubbleUi> BuildBubbleUi() override;
 
-  // The set of options users can pick from. For example, it can be
-  // USB/Bluetooth devices names which are listed in the chooser bubble
-  // so that users can grant permission.
-  virtual const std::vector<base::string16>& GetOptions() const = 0;
+  // The number of options users can pick from. For example, it can be
+  // the number of USB/Bluetooth device names which are listed in the
+  // chooser bubble so that users can grant permission.
+  virtual size_t NumOptions() const = 0;
+  // The |index|th option string which is listed in the chooser bubble.
+  virtual const base::string16& GetOption(size_t index) const = 0;
 
   // These three functions are called just before this object is destroyed:
   // Called when the user selects the |index|th element from the dialog.
-  virtual void Select(int index) = 0;
+  virtual void Select(size_t index) = 0;
   // Called when the user presses the 'Cancel' button in the dialog.
   virtual void Cancel() = 0;
   // Called when the user clicks outside the dialog or the dialog otherwise
   // closes without the user taking an explicit action.
   virtual void Close() = 0;
 
   // Only one observer may be registered at a time.
   void set_observer(Observer* observer) { observer_ = observer; }
   Observer* observer() const { return observer_; }
 
  private:
   Browser* browser_;
   Observer* observer_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ChooserBubbleDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_DELEGATE_H_