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

Unified Diff: content/public/browser/desktop_media_id.cc

Issue 1838623002: Bring Audio Share and Tab Share Default On (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Three value flag for Tab Created 4 years, 9 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: content/public/browser/desktop_media_id.cc
diff --git a/content/public/browser/desktop_media_id.cc b/content/public/browser/desktop_media_id.cc
index 8e74dcc866c3f4ed41addea3fa3b27848a3e2782..01a7f0b6b6c43b985f189572a88d51c121836ff9 100644
--- a/content/public/browser/desktop_media_id.cc
+++ b/content/public/browser/desktop_media_id.cc
@@ -98,21 +98,25 @@ aura::Window* DesktopMediaID::GetAuraWindowById(const DesktopMediaID& id) {
bool DesktopMediaID::operator<(const DesktopMediaID& other) const {
#if defined(USE_AURA)
- return std::tie(type, id, aura_id, web_contents_id) <
- std::tie(other.type, other.id, other.aura_id, other.web_contents_id);
+ return std::tie(type, id, aura_id, web_contents_id, audio_share) <
+ std::tie(other.type, other.id, other.aura_id, other.web_contents_id,
+ other.audio_share);
#else
- return std::tie(type, id, web_contents_id) <
- std::tie(other.type, other.id, other.web_contents_id);
+ return std::tie(type, id, web_contents_id, audio_share) <
+ std::tie(other.type, other.id, other.web_contents_id,
+ other.audio_share);
#endif
}
bool DesktopMediaID::operator==(const DesktopMediaID& other) const {
#if defined(USE_AURA)
return type == other.type && id == other.id && aura_id == other.aura_id &&
- web_contents_id == other.web_contents_id;
+ web_contents_id == other.web_contents_id &&
+ audio_share == other.audio_share;
#else
return type == other.type && id == other.id &&
- web_contents_id == other.web_contents_id;
+ web_contents_id == other.web_contents_id &&
+ audio_share == other.audio_share;
#endif
}
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698