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

Side by Side Diff: Source/modules/mediastream/MediaDeviceInfo.h

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 14 matching lines...) Expand all
25 25
26 #ifndef MediaDeviceInfo_h 26 #ifndef MediaDeviceInfo_h
27 #define MediaDeviceInfo_h 27 #define MediaDeviceInfo_h
28 28
29 #include "bindings/core/v8/ScriptWrappable.h" 29 #include "bindings/core/v8/ScriptWrappable.h"
30 #include "platform/heap/Handle.h" 30 #include "platform/heap/Handle.h"
31 #include "public/platform/WebMediaDeviceInfo.h" 31 #include "public/platform/WebMediaDeviceInfo.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class MediaDeviceInfo FINAL : public GarbageCollectedFinalized<MediaDeviceInfo>, public ScriptWrappable { 35 class MediaDeviceInfo final : public GarbageCollectedFinalized<MediaDeviceInfo>, public ScriptWrappable {
36 DEFINE_WRAPPERTYPEINFO(); 36 DEFINE_WRAPPERTYPEINFO();
37 public: 37 public:
38 static MediaDeviceInfo* create(const WebMediaDeviceInfo&); 38 static MediaDeviceInfo* create(const WebMediaDeviceInfo&);
39 39
40 String deviceId() const; 40 String deviceId() const;
41 String kind() const; 41 String kind() const;
42 String label() const; 42 String label() const;
43 String groupId() const; 43 String groupId() const;
44 44
45 void trace(Visitor*) { } 45 void trace(Visitor*) { }
46 46
47 private: 47 private:
48 explicit MediaDeviceInfo(const WebMediaDeviceInfo&); 48 explicit MediaDeviceInfo(const WebMediaDeviceInfo&);
49 49
50 WebMediaDeviceInfo m_webMediaDeviceInfo; 50 WebMediaDeviceInfo m_webMediaDeviceInfo;
51 }; 51 };
52 52
53 typedef HeapVector<Member<MediaDeviceInfo> > MediaDeviceInfoVector; 53 typedef HeapVector<Member<MediaDeviceInfo> > MediaDeviceInfoVector;
54 54
55 } // namespace blink 55 } // namespace blink
56 56
57 #endif // MediaDeviceInfo_h 57 #endif // MediaDeviceInfo_h
OLDNEW
« no previous file with comments | « Source/modules/mediasource/SourceBufferList.h ('k') | Source/modules/mediastream/MediaDevicesRequest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698