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

Side by Side Diff: media/ozone/media_ozone_platform.cc

Issue 1410123003: Rename "test" ozone platform to "headless" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final fix Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « chromecast/chromecast_tests.gypi ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/trace_event/trace_event.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"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 46
47 MediaOzonePlatform* CreateMediaOzonePlatformEgltest() { 47 MediaOzonePlatform* CreateMediaOzonePlatformEgltest() {
48 return new MediaOzonePlatformStub; 48 return new MediaOzonePlatformStub;
49 } 49 }
50 50
51 MediaOzonePlatform* CreateMediaOzonePlatformGbm() { 51 MediaOzonePlatform* CreateMediaOzonePlatformGbm() {
52 return new MediaOzonePlatformStub; 52 return new MediaOzonePlatformStub;
53 } 53 }
54 54
55 MediaOzonePlatform* CreateMediaOzonePlatformTest() { 55 MediaOzonePlatform* CreateMediaOzonePlatformHeadless() {
56 return new MediaOzonePlatformStub; 56 return new MediaOzonePlatformStub;
57 } 57 }
58 58
59 MediaOzonePlatform::MediaOzonePlatform() { 59 MediaOzonePlatform::MediaOzonePlatform() {
60 CHECK(!instance_) << "There should only be a single MediaOzonePlatform."; 60 CHECK(!instance_) << "There should only be a single MediaOzonePlatform.";
61 instance_ = this; 61 instance_ = this;
62 } 62 }
63 63
64 MediaOzonePlatform::~MediaOzonePlatform() { 64 MediaOzonePlatform::~MediaOzonePlatform() {
65 CHECK_EQ(instance_, this); 65 CHECK_EQ(instance_, this);
(...skipping 26 matching lines...) Expand all
92 ui::PlatformObject<MediaOzonePlatform>::Create(); 92 ui::PlatformObject<MediaOzonePlatform>::Create();
93 93
94 // TODO(spang): Currently need to leak this object. 94 // TODO(spang): Currently need to leak this object.
95 CHECK_EQ(instance_, platform.release()); 95 CHECK_EQ(instance_, platform.release());
96 } 96 }
97 97
98 // static 98 // static
99 MediaOzonePlatform* MediaOzonePlatform::instance_; 99 MediaOzonePlatform* MediaOzonePlatform::instance_;
100 100
101 } // namespace media 101 } // namespace media
OLDNEW
« no previous file with comments | « chromecast/chromecast_tests.gypi ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698