Chromium Code Reviews| Index: chrome/browser/chooser_controller/mock_chooser_controller.cc |
| diff --git a/chrome/browser/chooser_controller/mock_chooser_controller.cc b/chrome/browser/chooser_controller/mock_chooser_controller.cc |
| index 72674501f107ae2984a36ebec47eb97350266f7f..a81b27d89eb82d65276be3b64ac248502b318910 100644 |
| --- a/chrome/browser/chooser_controller/mock_chooser_controller.cc |
| +++ b/chrome/browser/chooser_controller/mock_chooser_controller.cc |
| @@ -4,6 +4,8 @@ |
| #include "chrome/browser/chooser_controller/mock_chooser_controller.h" |
| +#include <algorithm> |
| + |
| #include "base/logging.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "chrome/grit/generated_resources.h" |
| @@ -87,13 +89,13 @@ void MockChooserController::OnDiscoveryStateChanged( |
| } |
| } |
| -void MockChooserController::OptionAdded(const base::string16 option_name) { |
| +void MockChooserController::OptionAdded(const base::string16& option_name) { |
| option_names_.push_back(option_name); |
| if (view()) |
| view()->OnOptionAdded(option_names_.size() - 1); |
| } |
| -void MockChooserController::OptionRemoved(const base::string16 option_name) { |
| +void MockChooserController::OptionRemoved(const base::string16& option_name) { |
| for (auto it = option_names_.begin(); it != option_names_.end(); ++it) { |
|
msw
2016/08/12 22:19:33
optional nit: use std::find here too.
juncai
2016/08/15 18:11:19
Done.
|
| if (*it == option_name) { |
| size_t index = it - option_names_.begin(); |
| @@ -105,6 +107,18 @@ void MockChooserController::OptionRemoved(const base::string16 option_name) { |
| } |
| } |
| +void MockChooserController::OptionUpdated( |
| + const base::string16& previous_option_name, |
| + const base::string16& new_option_name) { |
| + auto it = std::find(option_names_.begin(), option_names_.end(), |
| + previous_option_name); |
| + DCHECK(it != option_names_.end()); |
| + size_t index = std::distance(option_names_.begin(), it); |
| + *it = new_option_name; |
| + if (view()) |
| + view()->OnOptionUpdated(index); |
| +} |
| + |
| void MockChooserController::ClearAllOptions() { |
| option_names_.clear(); |
| } |