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

Unified Diff: chrome/browser/extensions/api/copresence/copresence_translations.cc

Issue 600843004: Setting AudioConfiguration and deleting DeviceCapabilities hacks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Correcting DeviceCapabilities Created 6 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/extensions/api/copresence/copresence_translations.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_translations.cc b/chrome/browser/extensions/api/copresence/copresence_translations.cc
index d7d80568761091d24ee3756deef531622b0d2d6b..2fb81b453908ab3f6e0e8376f4e707c99d54a79d 100644
--- a/chrome/browser/extensions/api/copresence/copresence_translations.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_translations.cc
@@ -9,6 +9,8 @@
#include "components/copresence/proto/enums.pb.h"
#include "components/copresence/proto/rpcs.pb.h"
+using copresence::AUDIBLE;
+using copresence::AUDIO_CONFIGURATION_UNKNOWN;
using copresence::BROADCAST_AND_SCAN;
using copresence::BROADCAST_ONLY;
using copresence::BROADCAST_SCAN_CONFIGURATION_UNKNOWN;
@@ -54,9 +56,12 @@ void SetTokenExchangeStrategy(const Strategy* strategy,
strategy_proto->set_broadcast_scan_configuration(
config == BROADCAST_SCAN_CONFIGURATION_UNKNOWN ?
default_config : config);
- strategy_proto->set_use_audible(strategy->audible && *strategy->audible);
+ strategy_proto->set_audio_configuration(
+ strategy->audible && *strategy->audible ?
+ AUDIBLE : AUDIO_CONFIGURATION_UNKNOWN);
} else {
strategy_proto->set_broadcast_scan_configuration(default_config);
+ strategy_proto->set_audio_configuration(AUDIO_CONFIGURATION_UNKNOWN);
}
}
« no previous file with comments | « chrome/browser/extensions/api/copresence/copresence_api_unittest.cc ('k') | components/copresence/proto/data.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698