Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Unified Diff: third_party/WebKit/Source/core/html/shadow/MediaRemotingInterstitial.cpp

Issue 2898553002: [Media,Remoting] Remove the disable remoting button on Android (Closed)
Patch Set: Don't show the exit button on Android only for now Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/html/shadow/MediaRemotingInterstitial.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaRemotingInterstitial.cpp b/third_party/WebKit/Source/core/html/shadow/MediaRemotingInterstitial.cpp
index f38296b13caa2f55ef6c9b2a6b8d504657ccf12d..be4809ee67bd21f94a88efd970fc73a4685b0517 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaRemotingInterstitial.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaRemotingInterstitial.cpp
@@ -8,6 +8,7 @@
#include "core/html/HTMLImageElement.h"
#include "core/html/HTMLVideoElement.h"
#include "core/html/shadow/MediaRemotingElements.h"
+#include "platform/RuntimeEnabledFeatures.h"
namespace {
@@ -40,8 +41,10 @@ MediaRemotingInterstitial::MediaRemotingInterstitial(
cast_text_message_ = new MediaRemotingCastMessageElement(*this);
AppendChild(cast_text_message_);
- exit_button_ = new MediaRemotingExitButtonElement(*this);
- AppendChild(exit_button_);
+ if (!RuntimeEnabledFeatures::newRemotePlaybackPipelineEnabled()) {
+ exit_button_ = new MediaRemotingExitButtonElement(*this);
+ AppendChild(exit_button_);
+ }
}
void MediaRemotingInterstitial::Show() {
@@ -50,7 +53,8 @@ void MediaRemotingInterstitial::Show() {
toggle_insterstitial_timer_.Stop();
should_be_visible_ = true;
RemoveInlineStyleProperty(CSSPropertyDisplay);
- exit_button_->OnShown();
+ if (exit_button_)
+ exit_button_->OnShown();
toggle_insterstitial_timer_.StartOneShot(kStyleChangeTransSeconds,
BLINK_FROM_HERE);
}
@@ -62,7 +66,8 @@ void MediaRemotingInterstitial::Hide() {
should_be_visible_ = false;
SetInlineStyleProperty(CSSPropertyOpacity, 0,
CSSPrimitiveValue::UnitType::kNumber);
- exit_button_->OnHidden();
+ if (exit_button_)
+ exit_button_->OnHidden();
toggle_insterstitial_timer_.StartOneShot(kHiddenAnimationSeconds,
BLINK_FROM_HERE);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698