Bring Audio Share and Tab Share Default On

content/public/browser/desktop_media_id.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/desktop_media_id.h"
 
 #include <stdint.h>
 
 #include <vector>
 
@@ skipping 80 matching lines @@
 
 // static
 aura::Window* DesktopMediaID::GetAuraWindowById(const DesktopMediaID& id) {
   return AuraWindowRegistry::GetInstance()->GetWindowById(id.aura_id);
 }
 
 #endif  // defined(USE_AURA)
 
 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
 }
 
 // static
 // Input string should in format:
 // for WebContents:
 // web-contents-media-stream://"render_process_id":"render_process_id"
 // for no aura screen and window: screen:"window_id" or window:"window_id"
 // for aura screen and window: screen:"window_id:aura_id" or
 //                         window:"window_id:aura_id".
@@ skipping 64 matching lines @@
 
 #if defined(USE_AURA)
   prefix.append(":");
   prefix.append(base::Int64ToString(aura_id));
 #endif  // defined(USE_AURA)
 
   return prefix;
 }
 
 }  // namespace content