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 5eb14eae246b56ebc5e97907d11cfa25b6824fb2..dd6dd61204b96c9bff3ad95832ef02db5a9a9ef2 100644 |
--- a/chrome/browser/chooser_controller/mock_chooser_controller.cc |
+++ b/chrome/browser/chooser_controller/mock_chooser_controller.cc |
@@ -4,22 +4,25 @@ |
#include "chrome/browser/chooser_controller/mock_chooser_controller.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "chrome/grit/generated_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
MockChooserController::MockChooserController(content::RenderFrameHost* owner) |
: ChooserController(owner, |
IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN, |
- IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME) {} |
+ IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME), |
+ no_options_text_(l10n_util::GetStringUTF16( |
+ IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT)) {} |
MockChooserController::~MockChooserController() {} |
base::string16 MockChooserController::GetNoOptionsText() const { |
- return l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT); |
+ return no_options_text_; |
} |
base::string16 MockChooserController::GetOkButtonLabel() const { |
- return base::string16(); |
+ return l10n_util::GetStringUTF16(IDS_USB_DEVICE_CHOOSER_CONNECT_BUTTON_TEXT); |
} |
size_t MockChooserController::NumOptions() const { |
@@ -30,10 +33,52 @@ base::string16 MockChooserController::GetOption(size_t index) const { |
return option_names_[index]; |
} |
-void MockChooserController::RefreshOptions() {} |
- |
base::string16 MockChooserController::GetStatus() const { |
- return base::string16(); |
+ return status_text_; |
+} |
+ |
+void MockChooserController::OnAdapterPresenceChanged(AdapterPresence presence) { |
msw
2016/07/22 23:37:04
It'd be nice if the non-test code used the same en
juncai
2016/07/25 20:14:10
I changed this test code reusing content::Bluetoot
|
+ ClearAllOptions(); |
+ switch (presence) { |
+ case AdapterPresence::OFF: |
+ no_options_text_ = base::ASCIIToUTF16("Adapter turned off."); |
msw
2016/07/22 23:37:04
nit: use IDS_BLUETOOTH_DEVICE_CHOOSER_ADAPTER_OFF?
juncai
2016/07/25 20:14:10
Done.
|
+ status_text_ = base::string16(); |
+ if (view()) { |
+ view()->OnAdapterEnabledChanged(false /* Adapter is turned off */); |
+ } |
Reilly Grant (use Gerrit)
2016/07/22 22:24:53
nit: no braces
juncai
2016/07/25 20:14:10
Done.
|
+ break; |
+ case AdapterPresence::ON: |
+ no_options_text_ = |
+ l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT); |
+ status_text_ = |
+ l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN); |
+ if (view()) { |
+ view()->OnAdapterEnabledChanged(true /* Adapter is turned on */); |
+ } |
Reilly Grant (use Gerrit)
2016/07/22 22:24:53
nit: no braces
juncai
2016/07/25 20:14:10
Done.
|
+ break; |
+ } |
+} |
+ |
+void MockChooserController::OnDiscoveryStateChanged(DiscoveryState state) { |
+ switch (state) { |
+ case DiscoveryState::DISCOVERING: |
+ ClearAllOptions(); |
+ status_text_ = |
+ l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING); |
+ if (view()) { |
+ view()->OnRefreshStateChanged( |
+ true /* Refreshing options is in progress */); |
+ } |
+ break; |
+ case DiscoveryState::IDLE: |
+ status_text_ = |
+ l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN); |
+ if (view()) { |
+ view()->OnRefreshStateChanged( |
+ false /* Refreshing options is complete */); |
+ } |
+ break; |
+ } |
} |
void MockChooserController::OptionAdded(const base::string16 option_name) { |
@@ -53,3 +98,7 @@ void MockChooserController::OptionRemoved(const base::string16 option_name) { |
} |
} |
} |
+ |
+void MockChooserController::ClearAllOptions() { |
+ option_names_.clear(); |
+} |