| 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/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" |
| 8 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 9 #include "ui/ozone/platform_object.h" | 10 #include "ui/ozone/platform_object.h" |
| 10 #include "ui/ozone/platform_selection.h" | 11 #include "ui/ozone/platform_selection.h" |
| 11 | 12 |
| 12 namespace media { | 13 namespace media { |
| 13 | 14 |
| 14 namespace { | 15 namespace { |
| 15 | 16 |
| 16 class MediaOzonePlatformStub : public MediaOzonePlatform { | 17 class MediaOzonePlatformStub : public MediaOzonePlatform { |
| 17 public: | 18 public: |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 ui::PlatformObject<MediaOzonePlatform>::Create(); | 93 ui::PlatformObject<MediaOzonePlatform>::Create(); |
| 93 | 94 |
| 94 // TODO(spang): Currently need to leak this object. | 95 // TODO(spang): Currently need to leak this object. |
| 95 CHECK_EQ(instance_, platform.release()); | 96 CHECK_EQ(instance_, platform.release()); |
| 96 } | 97 } |
| 97 | 98 |
| 98 // static | 99 // static |
| 99 MediaOzonePlatform* MediaOzonePlatform::instance_; | 100 MediaOzonePlatform* MediaOzonePlatform::instance_; |
| 100 | 101 |
| 101 } // namespace media | 102 } // namespace media |
| OLD | NEW |