[Chromecast] Use only one LayoutProvider instance.

With one instance in MediaOverlayImpl and one in MediaControlUi, the extra instance's destruction would cause LayoutProvder::Get() to return nullptr. Bug: internal b/172316742 Test: repro bug Change-Id: I05fcd1ff6de895e394cc11c65d680764bfefa558 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551300 Commit-Queue: Thoren Paulson <thoren@chromium.org> Commit-Queue: Sean Topping <seantopping@chromium.org> Auto-Submit: Thoren Paulson <thoren@chromium.org> Reviewed-by: Sean Topping <seantopping@chromium.org> Cr-Commit-Position: refs/heads/master@{#829429}
qweri0p · Nov 19, 2020 · d4f80c6 · d4f80c6
1 parent 4d9adab
commit d4f80c6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/chromecast/ui/BUILD.gn b/chromecast/ui/BUILD.gn
@@ -53,7 +53,10 @@ cast_source_set("aura_components") {
   if (use_aura) {
     sources += [ "aura_components.cc" ]
 
-    deps += [ ":media_overlay" ]
+    deps += [
+      ":media_overlay",
+      "//ui/views",
+    ]
   } else {
     sources += [ "aura_components_dummy.cc" ]
   }

diff --git a/chromecast/ui/aura_components.h b/chromecast/ui/aura_components.h
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "chromecast/ui/media_overlay.h"
+#include "ui/views/layout/layout_provider.h"
 
 namespace chromecast {
 
@@ -28,6 +29,7 @@ class AuraComponents {
   MediaOverlay* media_overlay() const { return media_overlay_.get(); }
 
  private:
+  views::LayoutProvider layout_provider_;
   std::unique_ptr<MediaOverlay> media_overlay_;
 };
 

diff --git a/chromecast/ui/media_control_ui.h b/chromecast/ui/media_control_ui.h
@@ -17,7 +17,6 @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/progress_bar.h"
-#include "ui/views/layout/layout_provider.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromecast {
@@ -95,8 +94,6 @@ class MediaControlUi : public mojom::MediaControlUi {
 
   base::RepeatingTimer media_time_update_timer_;
 
-  views::LayoutProvider layout_provider_;
-
   SEQUENCE_CHECKER(sequence_checker_);
   base::WeakPtrFactory<MediaControlUi> weak_factory_;
 

diff --git a/chromecast/ui/media_overlay_impl.cc b/chromecast/ui/media_overlay_impl.cc
@@ -43,7 +43,6 @@ constexpr base::TimeDelta kUiHideDelay = base::TimeDelta::FromSeconds(3);
 
 MediaOverlayImpl::MediaOverlayImpl(CastWindowManager* window_manager)
     : window_manager_(window_manager),
-      layout_provider_(std::make_unique<views::LayoutProvider>()),
       ui_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       controller_(nullptr),
       volume_icon_image_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(

diff --git a/chromecast/ui/media_overlay_impl.h b/chromecast/ui/media_overlay_impl.h
@@ -22,7 +22,6 @@
 
 namespace views {
 class Label;
-class LayoutProvider;
 class ProgressBar;
 class View;
 class Widget;
@@ -68,7 +67,6 @@ class MediaOverlayImpl : public MediaOverlay,
       std::unique_ptr<views::View> content_view);
 
   CastWindowManager* const window_manager_;
-  const std::unique_ptr<views::LayoutProvider> layout_provider_;
   const scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   base::flat_set<media::MediaPipelineImpl*> passthrough_pipelines_;
   Controller* controller_;