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

Unified Diff: content/common/gpu/media/rendering_helper.cc

Issue 995103002: Fix video_decode_accelerator_unittest build on non-CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/ChromeOS/Chrome OS/ Created 5 years, 9 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 | « content/common/gpu/media/DEPS ('k') | ui/display/chromeos/display_configurator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/rendering_helper.cc
diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc
index 3ceea1fa6f9585178c9acda5e13d8f0f4c09ce2f..5a499ff02a878e9da27fb4e7f522e94411bed142 100644
--- a/content/common/gpu/media/rendering_helper.cc
+++ b/content/common/gpu/media/rendering_helper.cc
@@ -40,6 +40,7 @@
#if defined(USE_OZONE)
#if defined(OS_CHROMEOS)
#include "ui/display/chromeos/display_configurator.h"
+#include "ui/display/types/native_display_delegate.h"
#endif // defined(OS_CHROMEOS)
#include "ui/ozone/public/ozone_platform.h"
#include "ui/platform_window/platform_window.h"
@@ -246,6 +247,7 @@ void RenderingHelper::Setup() {
base::RunLoop wait_display_setup;
DisplayConfiguratorObserver display_setup_observer(&wait_display_setup);
display_configurator_.reset(new ui::DisplayConfigurator());
+ display_configurator_->SetDelegateForTesting(0);
display_configurator_->AddObserver(&display_setup_observer);
display_configurator_->Init(true);
display_configurator_->ForceInitialConfigure(0);
« no previous file with comments | « content/common/gpu/media/DEPS ('k') | ui/display/chromeos/display_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698