Media Controls: move time display elements to media_controls module.

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/MediaControlCurrentTimeDisplayElement.h"
 #include "modules/media_controls/elements/MediaControlMuteButtonElement.h"
 #include "modules/media_controls/elements/MediaControlOverlayEnclosureElement.h"
 #include "modules/media_controls/elements/MediaControlPanelEnclosureElement.h"
+#include "modules/media_controls/elements/MediaControlRemainingTimeDisplayElement.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 200 matching lines @@
 // | \-MediaControlCastButtonElement
 // |     (-internal-media-controls-overlay-cast-button)
 // \-MediaControlPanelEnclosureElement
 //   |    (-webkit-media-controls-enclosure)
 //   \-MediaControlPanelElement
 //     |    (-webkit-media-controls-panel)
 //     +-MediaControlPlayButtonElement
 //     |    (-webkit-media-controls-play-button)
 //     +-MediaControlCurrentTimeDisplayElement
 //     |    (-webkit-media-controls-current-time-display)
-//     +-MediaControlTimeRemainingDisplayElement
+//     +-MediaControlRemainingTimeDisplayElement
 //     |    (-webkit-media-controls-time-remaining-display)
 //     +-MediaControlTimelineElement
 //     |    (-webkit-media-controls-timeline)
 //     +-MediaControlMuteButtonElement
 //     |    (-webkit-media-controls-mute-button)
 //     +-MediaControlVolumeSliderElement
 //     |    (-webkit-media-controls-volume-slider)
 //     +-MediaControlFullscreenButtonElement
 //     |    (-webkit-media-controls-fullscreen-button)
 //     +-MediaControlDownloadButtonElement
@@ skipping 34 matching lines @@
   // controls correctly.
   enclosure_ = new MediaControlPanelEnclosureElement(*this);
 
   MediaControlPanelElement* panel = MediaControlPanelElement::Create(*this);
 
   MediaControlPlayButtonElement* play_button =
       MediaControlPlayButtonElement::Create(*this);
   play_button_ = play_button;
   panel->AppendChild(play_button);
 
-  MediaControlCurrentTimeDisplayElement* current_time_display =
-      MediaControlCurrentTimeDisplayElement::Create(*this);
-  current_time_display_ = current_time_display;
+  current_time_display_ = new MediaControlCurrentTimeDisplayElement(*this);
   current_time_display_->SetIsWanted(true);
-  panel->AppendChild(current_time_display);
+  panel->AppendChild(current_time_display_);
 
-  MediaControlTimeRemainingDisplayElement* duration_display =
-      MediaControlTimeRemainingDisplayElement::Create(*this);
-  duration_display_ = duration_display;
-  panel->AppendChild(duration_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 =
@@ skipping 789 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