Media Controls: move last buttons to modules/.

third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.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 28 matching lines @@
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/media/HTMLMediaElementControlsList.h"
 #include "core/html/track/TextTrackContainer.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTheme.h"
 #include "modules/media_controls/MediaControlsMediaEventListener.h"
 #include "modules/media_controls/MediaControlsOrientationLockDelegate.h"
 #include "modules/media_controls/MediaControlsWindowEventListener.h"
+#include "modules/media_controls/elements/MediaControlCastButtonElement.h"
 #include "modules/media_controls/elements/MediaControlCurrentTimeDisplayElement.h"
+#include "modules/media_controls/elements/MediaControlDownloadButtonElement.h"
 #include "modules/media_controls/elements/MediaControlFullscreenButtonElement.h"
 #include "modules/media_controls/elements/MediaControlMuteButtonElement.h"
 #include "modules/media_controls/elements/MediaControlOverflowMenuButtonElement.h"
 #include "modules/media_controls/elements/MediaControlOverflowMenuListElement.h"
 #include "modules/media_controls/elements/MediaControlOverlayEnclosureElement.h"
 #include "modules/media_controls/elements/MediaControlOverlayPlayButtonElement.h"
 #include "modules/media_controls/elements/MediaControlPanelElement.h"
 #include "modules/media_controls/elements/MediaControlPanelEnclosureElement.h"
 #include "modules/media_controls/elements/MediaControlPlayButtonElement.h"
 #include "modules/media_controls/elements/MediaControlRemainingTimeDisplayElement.h"
@@ skipping 247 matching lines @@
 //  +-MediaControlTextTrackListItemSubtitles
 //       (-internal-media-controls-text-track-list-kind-subtitles)
 void MediaControlsImpl::InitializeControls() {
   overlay_enclosure_ = new MediaControlOverlayEnclosureElement(*this);
 
   if (RuntimeEnabledFeatures::mediaControlsOverlayPlayButtonEnabled()) {
     overlay_play_button_ = new MediaControlOverlayPlayButtonElement(*this);
     overlay_enclosure_->AppendChild(overlay_play_button_);
   }
 
-  MediaControlCastButtonElement* overlay_cast_button =
-      MediaControlCastButtonElement::Create(*this, true);
-  overlay_cast_button_ = overlay_cast_button;
-  overlay_enclosure_->AppendChild(overlay_cast_button);
+  overlay_cast_button_ = new MediaControlCastButtonElement(*this, true);
+  overlay_enclosure_->AppendChild(overlay_cast_button_);
 
   AppendChild(overlay_enclosure_);
 
   // Create an enclosing element for the panel so we can visually offset the
   // controls correctly.
   enclosure_ = new MediaControlPanelEnclosureElement(*this);
 
   panel_ = new MediaControlPanelElement(*this);
 
   play_button_ = new MediaControlPlayButtonElement(*this);
@@ skipping 17 matching lines @@
   MediaControlVolumeSliderElement* slider =
       MediaControlVolumeSliderElement::Create(*this);
   volume_slider_ = slider;
   panel_->AppendChild(slider);
   if (PreferHiddenVolumeControls(GetDocument()))
     volume_slider_->SetIsWanted(false);
 
   fullscreen_button_ = new MediaControlFullscreenButtonElement(*this);
   panel_->AppendChild(fullscreen_button_);
 
-  MediaControlDownloadButtonElement* download_button =
-      MediaControlDownloadButtonElement::Create(*this);
-  download_button_ = download_button;
-  panel_->AppendChild(download_button);
+  download_button_ = new MediaControlDownloadButtonElement(*this);
+  panel_->AppendChild(download_button_);
 
-  MediaControlCastButtonElement* cast_button =
-      MediaControlCastButtonElement::Create(*this, false);
-  cast_button_ = cast_button;
-  panel_->AppendChild(cast_button);
+  cast_button_ = new MediaControlCastButtonElement(*this, false);
+  panel_->AppendChild(cast_button_);
 
   toggle_closed_captions_button_ =
       new MediaControlToggleClosedCaptionsButtonElement(*this);
   panel_->AppendChild(toggle_closed_captions_button_);
 
   enclosure_->AppendChild(panel_);
 
   AppendChild(enclosure_);
 
   text_track_list_ = new MediaControlTextTrackListElement(*this);
   AppendChild(text_track_list_);
 
   overflow_menu_ = new MediaControlOverflowMenuButtonElement(*this);
   panel_->AppendChild(overflow_menu_);
 
   overflow_list_ = new MediaControlOverflowMenuListElement(*this);
   AppendChild(overflow_list_);
 
   // The order in which we append elements to the overflow list is significant
   // because it determines how the elements show up in the overflow menu
   // relative to each other.  The first item appended appears at the top of the
   // overflow menu.
   overflow_list_->AppendChild(play_button_->CreateOverflowElement(
       *this, new MediaControlPlayButtonElement(*this)));
   overflow_list_->AppendChild(fullscreen_button_->CreateOverflowElement(
       *this, new MediaControlFullscreenButtonElement(*this)));
   overflow_list_->AppendChild(download_button_->CreateOverflowElement(
-      *this, MediaControlDownloadButtonElement::Create(*this)));
+      *this, new MediaControlDownloadButtonElement(*this)));
   overflow_list_->AppendChild(mute_button_->CreateOverflowElement(
       *this, new MediaControlMuteButtonElement(*this)));
   overflow_list_->AppendChild(cast_button_->CreateOverflowElement(
-      *this, MediaControlCastButtonElement::Create(*this, false)));
+      *this, new MediaControlCastButtonElement(*this, false)));
   overflow_list_->AppendChild(
       toggle_closed_captions_button_->CreateOverflowElement(
           *this, new MediaControlToggleClosedCaptionsButtonElement(*this)));
 }
 
 Node::InsertionNotificationRequest MediaControlsImpl::InsertedInto(
     ContainerNode* root) {
   if (!MediaElement().isConnected())
     return HTMLDivElement::InsertedInto(root);
 
@@ skipping 725 matching lines @@
   visitor->Trace(cast_button_);
   visitor->Trace(overlay_cast_button_);
   visitor->Trace(media_event_listener_);
   visitor->Trace(window_event_listener_);
   visitor->Trace(orientation_lock_delegate_);
   MediaControls::Trace(visitor);
   HTMLDivElement::Trace(visitor);
 }
 
 }  // namespace blink