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

Unified Diff: ui/ozone/ozone_platform.cc

Issue 269673005: media: Add MediaOzonePlatform support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix up dependency cycle Created 6 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
Index: ui/ozone/ozone_platform.cc
diff --git a/ui/ozone/ozone_platform.cc b/ui/ozone/ozone_platform.cc
index e8199b2ce93f86846235f73b8459b9f650859d5f..97c3660d19b195446d6af4738b8df1fa641f544d 100644
--- a/ui/ozone/ozone_platform.cc
+++ b/ui/ozone/ozone_platform.cc
@@ -9,6 +9,7 @@
#include "ui/events/ozone/event_factory_ozone.h"
#include "ui/gfx/ozone/surface_factory_ozone.h"
#include "ui/ozone/ime/input_method_context_factory_ozone.h"
+#include "ui/ozone/media/video_decode_factory_ozone.h"
#include "ui/ozone/ozone_platform.h"
#include "ui/ozone/ozone_platform_list.h"
#include "ui/ozone/ozone_switches.h"
@@ -46,6 +47,7 @@ OzonePlatform::~OzonePlatform() {
gfx::SurfaceFactoryOzone::SetInstance(NULL);
ui::EventFactoryOzone::SetInstance(NULL);
ui::CursorFactoryOzone::SetInstance(NULL);
+ ui::VideoDecodeFactoryOzone::SetInstance(NULL);
}
// static
@@ -65,6 +67,8 @@ void OzonePlatform::Initialize() {
ui::InputMethodContextFactoryOzone::SetInstance(
instance_->GetInputMethodContextFactoryOzone());
ui::CursorFactoryOzone::SetInstance(instance_->GetCursorFactoryOzone());
+ ui::VideoDecodeFactoryOzone::SetInstance(
+ instance_->GetVideoDecodeFactoryOzone());
}
// static

Powered by Google App Engine
This is Rietveld 408576698