Media Controls: move simple 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 29 matching lines @@
 #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/MediaControlCurrentTimeDisplayElement.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"
 #include "modules/media_controls/elements/MediaControlTextTrackListElement.h"
+#include "modules/media_controls/elements/MediaControlToggleClosedCaptionsButtonElement.h"
 #include "platform/EventDispatchForbiddenScope.h"
 
 namespace blink {
 
 namespace {
 
 // TODO(steimel): should have better solution than hard-coding pixel values.
 // Defined in core/css/mediaControls.css, core/css/mediaControlsAndroid.css,
 // and core/paint/MediaControlsPainter.cpp.
 constexpr int kOverlayPlayButtonWidth = 48;
@@ skipping 231 matching lines @@
 //  +-MediaControlTextTrackListItemInput
 //  |    (-internal-media-controls-text-track-list-item-input)
 //  +-MediaControlTextTrackListItemCaptions
 //  |    (-internal-media-controls-text-track-list-kind-captions)
 //  +-MediaControlTextTrackListItemSubtitles
 //       (-internal-media-controls-text-track-list-kind-subtitles)
 void MediaControlsImpl::InitializeControls() {
   overlay_enclosure_ = new MediaControlOverlayEnclosureElement(*this);
 
   if (RuntimeEnabledFeatures::mediaControlsOverlayPlayButtonEnabled()) {
-    MediaControlOverlayPlayButtonElement* overlay_play_button =
-        MediaControlOverlayPlayButtonElement::Create(*this);
-    overlay_play_button_ = overlay_play_button;
-    overlay_enclosure_->AppendChild(overlay_play_button);
+    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);
 
   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);
 
-  MediaControlPlayButtonElement* play_button =
-      MediaControlPlayButtonElement::Create(*this);
-  play_button_ = play_button;
-  panel_->AppendChild(play_button);
+  play_button_ = new MediaControlPlayButtonElement(*this);
+  panel_->AppendChild(play_button_);
 
   current_time_display_ = new MediaControlCurrentTimeDisplayElement(*this);
   current_time_display_->SetIsWanted(true);
   panel_->AppendChild(current_time_display_);
 
   duration_display_ = new MediaControlRemainingTimeDisplayElement(*this);
   panel_->AppendChild(duration_display_);
 
   MediaControlTimelineElement* timeline =
       MediaControlTimelineElement::Create(*this);
   timeline_ = timeline;
   panel_->AppendChild(timeline);
 
   mute_button_ = new MediaControlMuteButtonElement(*this);
   panel_->AppendChild(mute_button_);
 
   MediaControlVolumeSliderElement* slider =
       MediaControlVolumeSliderElement::Create(*this);
   volume_slider_ = slider;
   panel_->AppendChild(slider);
   if (PreferHiddenVolumeControls(GetDocument()))
     volume_slider_->SetIsWanted(false);
 
-  MediaControlFullscreenButtonElement* fullscreen_button =
-      MediaControlFullscreenButtonElement::Create(*this);
-  fullscreen_button_ = fullscreen_button;
-  panel_->AppendChild(fullscreen_button);
+  fullscreen_button_ = new MediaControlFullscreenButtonElement(*this);
+  panel_->AppendChild(fullscreen_button_);
 
   MediaControlDownloadButtonElement* download_button =
       MediaControlDownloadButtonElement::Create(*this);
   download_button_ = download_button;
   panel_->AppendChild(download_button);
 
   MediaControlCastButtonElement* cast_button =
       MediaControlCastButtonElement::Create(*this, false);
   cast_button_ = cast_button;
   panel_->AppendChild(cast_button);
 
-  MediaControlToggleClosedCaptionsButtonElement* toggle_closed_captions_button =
-      MediaControlToggleClosedCaptionsButtonElement::Create(*this);
-  toggle_closed_captions_button_ = toggle_closed_captions_button;
-  panel_->AppendChild(toggle_closed_captions_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_);
 
-  MediaControlOverflowMenuButtonElement* overflow_menu =
-      MediaControlOverflowMenuButtonElement::Create(*this);
-  overflow_menu_ = overflow_menu;
-  panel_->AppendChild(overflow_menu);
+  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, MediaControlPlayButtonElement::Create(*this)));
+      *this, new MediaControlPlayButtonElement(*this)));
   overflow_list_->AppendChild(fullscreen_button_->CreateOverflowElement(
-      *this, MediaControlFullscreenButtonElement::Create(*this)));
+      *this, new MediaControlFullscreenButtonElement(*this)));
   overflow_list_->AppendChild(download_button_->CreateOverflowElement(
       *this, MediaControlDownloadButtonElement::Create(*this)));
   overflow_list_->AppendChild(mute_button_->CreateOverflowElement(
       *this, new MediaControlMuteButtonElement(*this)));
   overflow_list_->AppendChild(cast_button_->CreateOverflowElement(
       *this, MediaControlCastButtonElement::Create(*this, false)));
   overflow_list_->AppendChild(
       toggle_closed_captions_button_->CreateOverflowElement(
-          *this, MediaControlToggleClosedCaptionsButtonElement::Create(*this)));
+          *this, new MediaControlToggleClosedCaptionsButtonElement(*this)));
 }
 
 Node::InsertionNotificationRequest MediaControlsImpl::InsertedInto(
     ContainerNode* root) {
   if (!MediaElement().isConnected())
     return HTMLDivElement::InsertedInto(root);
 
   // TODO(mlamouri): we should show the controls instead of having
   // HTMLMediaElement do it.
 
@@ skipping 722 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