| 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 34f21ff80c911d2c88d4fb5ba9599276f22d277b..63dadb03e7a83368dca3debd9e5439c17eeb70f5 100644
|
| --- a/chrome/browser/chooser_controller/mock_chooser_controller.cc
|
| +++ b/chrome/browser/chooser_controller/mock_chooser_controller.cc
|
| @@ -14,9 +14,7 @@
|
| MockChooserController::MockChooserController(content::RenderFrameHost* owner)
|
| : ChooserController(owner,
|
| IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN,
|
| - IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME),
|
| - no_options_text_(l10n_util::GetStringUTF16(
|
| - IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT)) {}
|
| + IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME) {}
|
|
|
| MockChooserController::~MockChooserController() {}
|
|
|
| @@ -25,7 +23,7 @@ bool MockChooserController::ShouldShowIconBeforeText() const {
|
| }
|
|
|
| base::string16 MockChooserController::GetNoOptionsText() const {
|
| - return no_options_text_;
|
| + return l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT);
|
| }
|
|
|
| base::string16 MockChooserController::GetOkButtonLabel() const {
|
| @@ -66,15 +64,11 @@ void MockChooserController::OnAdapterPresenceChanged(
|
| NOTREACHED();
|
| break;
|
| case content::BluetoothChooser::AdapterPresence::POWERED_OFF:
|
| - no_options_text_ =
|
| - l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_ADAPTER_OFF);
|
| status_text_ = base::string16();
|
| if (view())
|
| view()->OnAdapterEnabledChanged(false /* Adapter is turned off */);
|
| break;
|
| case content::BluetoothChooser::AdapterPresence::POWERED_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())
|
|
|