| Index: ui/ozone/ozone_platform.cc
|
| diff --git a/ui/ozone/ozone_platform.cc b/ui/ozone/ozone_platform.cc
|
| index e8199b2ce93f86846235f73b8459b9f650859d5f..3edc093c2505f3b68a2a5695f564b3ac9eeefd68 100644
|
| --- a/ui/ozone/ozone_platform.cc
|
| +++ b/ui/ozone/ozone_platform.cc
|
| @@ -5,6 +5,7 @@
|
| #include "base/command_line.h"
|
| #include "base/debug/trace_event.h"
|
| #include "base/logging.h"
|
| +#include "content/common/gpu/media/video_decode_factory_ozone.h"
|
| #include "ui/base/cursor/ozone/cursor_factory_ozone.h"
|
| #include "ui/events/ozone/event_factory_ozone.h"
|
| #include "ui/gfx/ozone/surface_factory_ozone.h"
|
| @@ -43,6 +44,7 @@ std::string GetPlatformName() {
|
| OzonePlatform::OzonePlatform() {}
|
|
|
| OzonePlatform::~OzonePlatform() {
|
| + content::VideoDecodeFactoryOzone::SetInstance(NULL);
|
| gfx::SurfaceFactoryOzone::SetInstance(NULL);
|
| ui::EventFactoryOzone::SetInstance(NULL);
|
| ui::CursorFactoryOzone::SetInstance(NULL);
|
| @@ -60,6 +62,8 @@ void OzonePlatform::Initialize() {
|
| instance_ = CreatePlatform(platform);
|
|
|
| // Inject ozone interfaces.
|
| + content::VideoDecodeFactoryOzone::SetInstance(
|
| + instance_->GetVideoDecodeFactoryOzone());
|
| gfx::SurfaceFactoryOzone::SetInstance(instance_->GetSurfaceFactoryOzone());
|
| ui::EventFactoryOzone::SetInstance(instance_->GetEventFactoryOzone());
|
| ui::InputMethodContextFactoryOzone::SetInstance(
|
|
|