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

Side by Side Diff: Source/modules/mediastream/MediaDevicesRequest.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
« no previous file with comments | « Source/modules/mediastream/MediaDeviceInfo.h ('k') | Source/modules/mediastream/MediaStream.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 /* 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 21 matching lines...) Expand all
32 #include "platform/heap/Handle.h" 32 #include "platform/heap/Handle.h"
33 #include "wtf/PassOwnPtr.h" 33 #include "wtf/PassOwnPtr.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class Document; 37 class Document;
38 class ExceptionState; 38 class ExceptionState;
39 class MediaStreamDescriptor; 39 class MediaStreamDescriptor;
40 class UserMediaController; 40 class UserMediaController;
41 41
42 class MediaDevicesRequest FINAL : public GarbageCollectedFinalized<MediaDevicesR equest>, public ActiveDOMObject { 42 class MediaDevicesRequest final : public GarbageCollectedFinalized<MediaDevicesR equest>, public ActiveDOMObject {
43 public: 43 public:
44 static MediaDevicesRequest* create(ExecutionContext*, UserMediaController*, MediaDeviceInfoCallback*, ExceptionState&); 44 static MediaDevicesRequest* create(ExecutionContext*, UserMediaController*, MediaDeviceInfoCallback*, ExceptionState&);
45 virtual ~MediaDevicesRequest(); 45 virtual ~MediaDevicesRequest();
46 46
47 MediaDeviceInfoCallback* callback() const { return m_callback.get(); } 47 MediaDeviceInfoCallback* callback() const { return m_callback.get(); }
48 Document* ownerDocument(); 48 Document* ownerDocument();
49 49
50 void start(); 50 void start();
51 51
52 void succeed(const MediaDeviceInfoVector&); 52 void succeed(const MediaDeviceInfoVector&);
53 53
54 // ActiveDOMObject 54 // ActiveDOMObject
55 virtual void stop() OVERRIDE; 55 virtual void stop() override;
56 56
57 void trace(Visitor*); 57 void trace(Visitor*);
58 58
59 private: 59 private:
60 MediaDevicesRequest(ExecutionContext*, UserMediaController*, MediaDeviceInfo Callback*); 60 MediaDevicesRequest(ExecutionContext*, UserMediaController*, MediaDeviceInfo Callback*);
61 61
62 UserMediaController* m_controller; 62 UserMediaController* m_controller;
63 63
64 Member<MediaDeviceInfoCallback> m_callback; 64 Member<MediaDeviceInfoCallback> m_callback;
65 }; 65 };
66 66
67 } // namespace blink 67 } // namespace blink
68 68
69 #endif // MediaDevicesRequest_h 69 #endif // MediaDevicesRequest_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaDeviceInfo.h ('k') | Source/modules/mediastream/MediaStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698