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

Side by Side Diff: Source/modules/mediastream/UserMediaRequest.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) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 29 matching lines...) Expand all
40 #include "wtf/PassRefPtr.h" 40 #include "wtf/PassRefPtr.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 class Dictionary; 44 class Dictionary;
45 class Document; 45 class Document;
46 class ExceptionState; 46 class ExceptionState;
47 class MediaStreamDescriptor; 47 class MediaStreamDescriptor;
48 class UserMediaController; 48 class UserMediaController;
49 49
50 class UserMediaRequest FINAL : public GarbageCollectedFinalized<UserMediaRequest >, public ContextLifecycleObserver { 50 class UserMediaRequest final : public GarbageCollectedFinalized<UserMediaRequest >, public ContextLifecycleObserver {
51 public: 51 public:
52 static UserMediaRequest* create(ExecutionContext*, UserMediaController*, con st Dictionary& options, NavigatorUserMediaSuccessCallback*, NavigatorUserMediaEr rorCallback*, ExceptionState&); 52 static UserMediaRequest* create(ExecutionContext*, UserMediaController*, con st Dictionary& options, NavigatorUserMediaSuccessCallback*, NavigatorUserMediaEr rorCallback*, ExceptionState&);
53 virtual ~UserMediaRequest(); 53 virtual ~UserMediaRequest();
54 54
55 NavigatorUserMediaSuccessCallback* successCallback() const { return m_succes sCallback.get(); } 55 NavigatorUserMediaSuccessCallback* successCallback() const { return m_succes sCallback.get(); }
56 NavigatorUserMediaErrorCallback* errorCallback() const { return m_errorCallb ack.get(); } 56 NavigatorUserMediaErrorCallback* errorCallback() const { return m_errorCallb ack.get(); }
57 Document* ownerDocument(); 57 Document* ownerDocument();
58 58
59 void start(); 59 void start();
60 60
61 void succeed(MediaStreamDescriptor*); 61 void succeed(MediaStreamDescriptor*);
62 void failPermissionDenied(const String& message); 62 void failPermissionDenied(const String& message);
63 void failConstraint(const String& constraintName, const String& message); 63 void failConstraint(const String& constraintName, const String& message);
64 void failUASpecific(const String& name, const String& message, const String& constraintName); 64 void failUASpecific(const String& name, const String& message, const String& constraintName);
65 65
66 bool audio() const; 66 bool audio() const;
67 bool video() const; 67 bool video() const;
68 WebMediaConstraints audioConstraints() const; 68 WebMediaConstraints audioConstraints() const;
69 WebMediaConstraints videoConstraints() const; 69 WebMediaConstraints videoConstraints() const;
70 70
71 // ContextLifecycleObserver 71 // ContextLifecycleObserver
72 virtual void contextDestroyed() OVERRIDE; 72 virtual void contextDestroyed() override;
73 73
74 void trace(Visitor*); 74 void trace(Visitor*);
75 75
76 private: 76 private:
77 UserMediaRequest(ExecutionContext*, UserMediaController*, WebMediaConstraint s audio, WebMediaConstraints video, NavigatorUserMediaSuccessCallback*, Navigato rUserMediaErrorCallback*); 77 UserMediaRequest(ExecutionContext*, UserMediaController*, WebMediaConstraint s audio, WebMediaConstraints video, NavigatorUserMediaSuccessCallback*, Navigato rUserMediaErrorCallback*);
78 78
79 WebMediaConstraints m_audio; 79 WebMediaConstraints m_audio;
80 WebMediaConstraints m_video; 80 WebMediaConstraints m_video;
81 81
82 UserMediaController* m_controller; 82 UserMediaController* m_controller;
83 83
84 Member<NavigatorUserMediaSuccessCallback> m_successCallback; 84 Member<NavigatorUserMediaSuccessCallback> m_successCallback;
85 Member<NavigatorUserMediaErrorCallback> m_errorCallback; 85 Member<NavigatorUserMediaErrorCallback> m_errorCallback;
86 }; 86 };
87 87
88 } // namespace blink 88 } // namespace blink
89 89
90 #endif // UserMediaRequest_h 90 #endif // UserMediaRequest_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/UserMediaController.h ('k') | Source/modules/navigatorcontentutils/NavigatorContentUtils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698