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" | 7 #include "base/debug/trace_event.h" |
8 #include "base/logging.h" | 8 #include "base/logging.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" |
(...skipping 30 matching lines...) Expand all Loading... |
41 } | 41 } |
42 | 42 |
43 MediaOzonePlatform* CreateMediaOzonePlatformGbm() { | 43 MediaOzonePlatform* CreateMediaOzonePlatformGbm() { |
44 return new MediaOzonePlatformStub; | 44 return new MediaOzonePlatformStub; |
45 } | 45 } |
46 | 46 |
47 MediaOzonePlatform* CreateMediaOzonePlatformTest() { | 47 MediaOzonePlatform* CreateMediaOzonePlatformTest() { |
48 return new MediaOzonePlatformStub; | 48 return new MediaOzonePlatformStub; |
49 } | 49 } |
50 | 50 |
| 51 MediaOzonePlatform* CreateMediaOzonePlatformX11() { |
| 52 return new MediaOzonePlatformStub; |
| 53 } |
| 54 |
51 MediaOzonePlatform::MediaOzonePlatform() { | 55 MediaOzonePlatform::MediaOzonePlatform() { |
52 CHECK(!instance_) << "There should only be a single MediaOzonePlatform."; | 56 CHECK(!instance_) << "There should only be a single MediaOzonePlatform."; |
53 instance_ = this; | 57 instance_ = this; |
54 } | 58 } |
55 | 59 |
56 MediaOzonePlatform::~MediaOzonePlatform() { | 60 MediaOzonePlatform::~MediaOzonePlatform() { |
57 CHECK_EQ(instance_, this); | 61 CHECK_EQ(instance_, this); |
58 instance_ = NULL; | 62 instance_ = NULL; |
59 } | 63 } |
60 | 64 |
(...skipping 23 matching lines...) Expand all Loading... |
84 ui::PlatformObject<MediaOzonePlatform>::Create(); | 88 ui::PlatformObject<MediaOzonePlatform>::Create(); |
85 | 89 |
86 // TODO(spang): Currently need to leak this object. | 90 // TODO(spang): Currently need to leak this object. |
87 CHECK_EQ(instance_, platform.release()); | 91 CHECK_EQ(instance_, platform.release()); |
88 } | 92 } |
89 | 93 |
90 // static | 94 // static |
91 MediaOzonePlatform* MediaOzonePlatform::instance_; | 95 MediaOzonePlatform* MediaOzonePlatform::instance_; |
92 | 96 |
93 } // namespace media | 97 } // namespace media |
OLD | NEW |