Don't use cast overlay when using default controls.

third_party/WebKit/Source/core/html/shadow/MediaControls.cpp

 /*
  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 756 matching lines @@
   // Insert an overflow menu. However, if we see that the overflow menu
   // doesn't end up containing at least two elements, we will not display it
   // but instead make place for the first element that was dropped.
   m_overflowMenu->setDoesFit(true);
   m_overflowMenu->setIsWanted(true);
   usedWidth = minimumWidth;
 
   std::list<MediaControlElement*> overflowElements;
   MediaControlElement* firstDisplacedElement = nullptr;
   // For each control that fits, enable it in order of decreasing priority.
-  bool droppedCastButton = false;
   for (MediaControlElement* element : elements) {
     if (!element)
       continue;
     int width = minimumWidth;
     if ((element == m_timeline.get()) || (element == m_volumeSlider.get()))
       width += sliderMargin;
     element->shouldShowButtonInOverflowMenu(false);
     if (element->isWanted()) {
       if (usedWidth + width <= m_panelWidth) {
         element->setDoesFit(true);
         usedWidth += width;
       } else {
         element->setDoesFit(false);
-        // TODO(mlamouri): we should probably no longer mark the cast
-        // button as dropped, it should appear in the overflow menu.
-        if (element == m_castButton.get())
-          droppedCastButton = true;
         element->shouldShowButtonInOverflowMenu(true);
         if (element->hasOverflowButton())
           overflowElements.push_front(element);
         // We want a way to access the first media element that was
         // removed. If we don't end up needing an overflow menu, we can
         // use the space the overflow menu would have taken up to
         // instead display that media element.
         if (!element->hasOverflowButton() && !firstDisplacedElement)
           firstDisplacedElement = element;
       }
@@ skipping 10 matching lines @@
       if ((firstDisplacedElement == m_timeline.get()) ||
           (firstDisplacedElement == m_volumeSlider.get()))
         width += sliderMargin;
       if (usedWidth + width <= m_panelWidth)
         firstDisplacedElement->setDoesFit(true);
     }
   } else if (overflowElements.size() == 1) {
     m_overflowMenu->setIsWanted(false);
     overflowElements.front()->setDoesFit(true);
   }
-
-  // Special case for cast: if we want a cast button but dropped it, then
-  // show the overlay cast button instead.
-  if (m_castButton->isWanted()) {
-    if (droppedCastButton)
-      m_overlayCastButton->tryShowOverlay();
-    else
-      m_overlayCastButton->setIsWanted(false);
-  }
 }
 
 void MediaControls::setAllowHiddenVolumeControls(bool allow) {
   m_allowHiddenVolumeControls = allow;
   // Update the controls visibility.
   updateVolume();
 }
 
 void MediaControls::invalidate(Element* element) {
   if (!element)
@@ skipping 40 matching lines @@
   visitor->trace(m_enclosure);
   visitor->trace(m_textTrackList);
   visitor->trace(m_overflowMenu);
   visitor->trace(m_overflowList);
   visitor->trace(m_castButton);
   visitor->trace(m_overlayCastButton);
   HTMLDivElement::trace(visitor);
 }
 
 }  // namespace blink