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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 months 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 | « media/mojo/services/mojo_renderer_service.h ('k') | media/renderers/audio_renderer_impl.h » ('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/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
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
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_service.h ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698