Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Unified Diff: chrome/browser/chooser_controller/mock_chooser_controller.cc

Issue 2304213002: Show device connection and paired status in chooser on Mac (Closed)
Patch Set: use vector icons Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5a0504d4a998c36fac6b280821f83f5e7f46501a..037de55609b31c9e5116c83bedc766c005fd5fdf 100644
--- a/chrome/browser/chooser_controller/mock_chooser_controller.cc
+++ b/chrome/browser/chooser_controller/mock_chooser_controller.cc
@@ -44,6 +44,14 @@ base::string16 MockChooserController::GetOption(size_t index) const {
return options_[index].name;
}
+bool MockChooserController::IsConnected(size_t index) const {
+ return options_[index].is_connected;
+}
+
+bool MockChooserController::IsPaired(size_t index) const {
+ return options_[index].is_paired;
+}
+
base::string16 MockChooserController::GetStatus() const {
return status_text_;
}
@@ -98,8 +106,11 @@ void MockChooserController::OnDiscoveryStateChanged(
}
void MockChooserController::OptionAdded(const base::string16& option_name,
- int signal_strength_level) {
- options_.push_back({option_name, signal_strength_level});
+ int signal_strength_level,
+ bool is_connected,
+ bool is_paired) {
+ options_.push_back(
+ {option_name, signal_strength_level, is_connected, is_paired});
if (view())
view()->OnOptionAdded(options_.size() - 1);
}
@@ -121,25 +132,32 @@ void MockChooserController::OptionRemoved(const base::string16& option_name) {
void MockChooserController::OptionUpdated(
const base::string16& previous_option_name,
const base::string16& new_option_name,
- int new_signal_strength_level) {
+ int new_signal_strength_level,
+ bool new_is_connected,
+ bool new_is_paired) {
auto it = std::find_if(options_.begin(), options_.end(),
[&previous_option_name](const OptionInfo& option) {
return option.name == previous_option_name;
});
if (it != options_.end()) {
- *it = {new_option_name, new_signal_strength_level};
+ *it = {new_option_name, new_signal_strength_level, new_is_connected,
+ new_is_paired};
if (view())
view()->OnOptionUpdated(it - options_.begin());
}
}
-const int MockChooserController::kNoImage = -1;
+const int MockChooserController::kNoSignalStrengthLevelImage = -1;
const int MockChooserController::kSignalStrengthLevel0Bar = 0;
const int MockChooserController::kSignalStrengthLevel1Bar = 1;
const int MockChooserController::kSignalStrengthLevel2Bar = 2;
const int MockChooserController::kSignalStrengthLevel3Bar = 3;
const int MockChooserController::kSignalStrengthLevel4Bar = 4;
+const bool MockChooserController::kConnected = true;
+const bool MockChooserController::kNotConnected = false;
+const bool MockChooserController::kPaired = true;
+const bool MockChooserController::kNotPaired = false;
void MockChooserController::ClearAllOptions() {
options_.clear();

Powered by Google App Engine
This is Rietveld 408576698