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

Side by Side Diff: media/base/media_log.h

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « media/base/media_export.h ('k') | media/base/media_switches.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef MEDIA_BASE_MEDIA_LOG_H_ 5 #ifndef MEDIA_BASE_MEDIA_LOG_H_
6 #define MEDIA_BASE_MEDIA_LOG_H_ 6 #define MEDIA_BASE_MEDIA_LOG_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "media/base/media_export.h"
11 #include "media/base/media_log_event.h" 10 #include "media/base/media_log_event.h"
12 11
13 namespace media { 12 namespace media {
14 13
15 class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> { 14 class MediaLog : public base::RefCountedThreadSafe<MediaLog> {
16 public: 15 public:
17 16
18 // Return a string to represent an EventType. 17 // Return a string to represent an EventType.
19 static const char* EventTypeToString(MediaLogEvent::Type type); 18 static const char* EventTypeToString(MediaLogEvent::Type type);
20 19
21 MediaLog(); 20 MediaLog();
22 21
23 // Methods called by loggers when events occur. These generate appropriate 22 // Methods called by loggers when events occur. These generate appropriate
24 // event parameters so the caller need not worry about them. 23 // event parameters so the caller need not worry about them.
25 void Load(const std::string& url); 24 void Load(const std::string& url);
(...skipping 16 matching lines...) Expand all
42 private: 41 private:
43 // A unique (to this process) id for this MediaLog. 42 // A unique (to this process) id for this MediaLog.
44 int32 id_; 43 int32 id_;
45 44
46 DISALLOW_COPY_AND_ASSIGN(MediaLog); 45 DISALLOW_COPY_AND_ASSIGN(MediaLog);
47 }; 46 };
48 47
49 } // namespace media 48 } // namespace media
50 49
51 #endif // MEDIA_BASE_MEDIA_LOG_H_ 50 #endif // MEDIA_BASE_MEDIA_LOG_H_
OLDNEW
« no previous file with comments | « media/base/media_export.h ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698