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

Unified Diff: ui/ozone/platform/dri/ozone_platform_dri.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/platform/dri/ozone_platform_dri.cc
diff --git a/ui/ozone/platform/dri/ozone_platform_dri.cc b/ui/ozone/platform/dri/ozone_platform_dri.cc
index 09dadb31f632dcecf2d0a3712b44aea07a7e9ce1..f9854ff780b46672a0b3634c85bd0495d0476ebc 100644
--- a/ui/ozone/platform/dri/ozone_platform_dri.cc
+++ b/ui/ozone/platform/dri/ozone_platform_dri.cc
@@ -8,6 +8,7 @@
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.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/platform/dri/cursor_factory_evdev_dri.h"
#include "ui/ozone/platform/dri/dri_surface_factory.h"
@@ -46,6 +47,10 @@ class OzonePlatformDri : public OzonePlatform {
virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {
return &cursor_factory_ozone_;
}
+ virtual ui::VideoDecodeFactoryOzone* GetVideoDecodeFactoryOzone()
+ OVERRIDE {
+ return &video_decode_factory_ozone_;
+ }
#if defined(OS_CHROMEOS)
virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate()
OVERRIDE {
@@ -63,6 +68,7 @@ class OzonePlatformDri : public OzonePlatform {
ui::EventFactoryEvdev event_factory_ozone_;
// This creates a minimal input context.
ui::InputMethodContextFactoryOzone input_method_context_factory_ozone_;
+ ui::VideoDecodeFactoryOzone video_decode_factory_ozone_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
};

Powered by Google App Engine
This is Rietveld 408576698