| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/ozone/media_ozone_platform.h" | 5 #include "media/ozone/media_ozone_platform.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | |
| 8 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/trace_event/trace_event.h" |
| 9 #include "ui/ozone/platform_object.h" | 9 #include "ui/ozone/platform_object.h" |
| 10 #include "ui/ozone/platform_selection.h" | 10 #include "ui/ozone/platform_selection.h" |
| 11 | 11 |
| 12 namespace media { | 12 namespace media { |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 class MediaOzonePlatformStub : public MediaOzonePlatform { | 16 class MediaOzonePlatformStub : public MediaOzonePlatform { |
| 17 public: | 17 public: |
| 18 MediaOzonePlatformStub() {} | 18 MediaOzonePlatformStub() {} |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 ui::PlatformObject<MediaOzonePlatform>::Create(); | 84 ui::PlatformObject<MediaOzonePlatform>::Create(); |
| 85 | 85 |
| 86 // TODO(spang): Currently need to leak this object. | 86 // TODO(spang): Currently need to leak this object. |
| 87 CHECK_EQ(instance_, platform.release()); | 87 CHECK_EQ(instance_, platform.release()); |
| 88 } | 88 } |
| 89 | 89 |
| 90 // static | 90 // static |
| 91 MediaOzonePlatform* MediaOzonePlatform::instance_; | 91 MediaOzonePlatform* MediaOzonePlatform::instance_; |
| 92 | 92 |
| 93 } // namespace media | 93 } // namespace media |
| OLD | NEW |