Picture-in-Picture: playback state change shouldn't show icons.

Updating the views visibility overrides the layer's visibility. This
makes sure the layer is set back to the correct visibility when the
views' one is updated in order to avoid the pause button to show up in
cases such as a playlist.

Bug: 863497
Change-Id: I0d9ce10b1219ea3af492269e228988f51c54b3e2
Reviewed-on: https://chromium-review.googlesource.com/1149507Reviewed-by: apacible <apacible@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578209}

chrome/browser/picture_in_picture/picture_in_picture_window_controller_browsertest.cc

@@ -519,6 +519,15 @@ IN_PROC_BROWSER_TEST_F(PictureInPictureWindowControllerBrowserTest,
   EXPECT_TRUE(window_controller()->GetWindowForTesting()->IsVisible());
   EXPECT_TRUE(
       window_controller()->GetWindowForTesting()->GetVideoLayer()->visible());
+
+#if !defined(OS_ANDROID)
+  OverlayWindowViews* overlay_window = static_cast<OverlayWindowViews*>(
+      window_controller()->GetWindowForTesting());
+
+  EXPECT_FALSE(overlay_window->play_pause_controls_view_for_testing()
+                   ->layer()
+                   ->visible());
+#endif
 }
 
 // Tests that we can enter Picture-in-Picture when a video is not preloaded,

chrome/browser/ui/views/overlay/overlay_window_views.cc

@@ -421,6 +421,9 @@ void OverlayWindowViews::UpdateVideoSize(const gfx::Size& natural_size) {
 }
 
 void OverlayWindowViews::SetPlaybackState(PlaybackState playback_state) {
+  // TODO(apacible): have machine state for controls visibility.
+  bool play_pause_layer_visible = GetPlayPauseControlsLayer()->visible();
+
   switch (playback_state) {
     case kPlaying:
       play_pause_controls_view_->SetToggled(true);
@@ -437,6 +440,8 @@ void OverlayWindowViews::SetPlaybackState(PlaybackState playback_state) {
       video_view_->SetVisible(false);
       break;
   }
+
+  GetPlayPauseControlsLayer()->SetVisible(play_pause_layer_visible);
 }
 
 ui::Layer* OverlayWindowViews::GetWindowBackgroundLayer() {
@@ -619,3 +624,7 @@ void OverlayWindowViews::TogglePlayPause() {
 void OverlayWindowViews::ClickCustomControl(const std::string& control_id) {
   controller_->ClickCustomControl(control_id);
 }
+
+views::View* OverlayWindowViews::play_pause_controls_view_for_testing() const {
+  return play_pause_controls_view_.get();
+}

chrome/browser/ui/views/overlay/overlay_window_views.h

@@ -60,6 +60,8 @@ class OverlayWindowViews : public content::OverlayWindow, public views::Widget {
   // Send the message that a custom control on |this| has been clicked.
   void ClickCustomControl(const std::string& control_id);
 
+  views::View* play_pause_controls_view_for_testing() const;
+
  private:
   // Gets the internal |ui::Layer| of the controls.
   ui::Layer* GetControlsBackgroundLayer();