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

Side by Side Diff: public/web/WebUserMediaRequest.h

Issue 454103003: Cleanup namespace usage in public/web/Web[N-Z]*.h. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | « public/web/WebUserGestureToken.h ('k') | public/web/WebWindowFeatures.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 30
31 #ifndef WebUserMediaRequest_h 31 #ifndef WebUserMediaRequest_h
32 #define WebUserMediaRequest_h 32 #define WebUserMediaRequest_h
33 33
34 #include "WebSecurityOrigin.h" 34 #include "WebSecurityOrigin.h"
35 #include "public/platform/WebCommon.h" 35 #include "public/platform/WebCommon.h"
36 #include "public/platform/WebPrivatePtr.h" 36 #include "public/platform/WebPrivatePtr.h"
37 #include "public/platform/WebString.h" 37 #include "public/platform/WebString.h"
38 38
39 namespace blink { 39 namespace blink {
40
40 class UserMediaRequest; 41 class UserMediaRequest;
41 }
42
43 namespace blink {
44 class WebDocument; 42 class WebDocument;
45 class WebMediaConstraints; 43 class WebMediaConstraints;
46 class WebMediaStream; 44 class WebMediaStream;
47 class WebMediaStreamSource; 45 class WebMediaStreamSource;
48 template <typename T> class WebVector; 46 template <typename T> class WebVector;
49 47
50 class WebUserMediaRequest { 48 class WebUserMediaRequest {
51 public: 49 public:
52 WebUserMediaRequest() { } 50 WebUserMediaRequest() { }
53 WebUserMediaRequest(const WebUserMediaRequest& request) { assign(request); } 51 WebUserMediaRequest(const WebUserMediaRequest& request) { assign(request); }
(...skipping 21 matching lines...) Expand all
75 BLINK_EXPORT void requestSucceeded(const WebMediaStream&); 73 BLINK_EXPORT void requestSucceeded(const WebMediaStream&);
76 74
77 BLINK_EXPORT void requestDenied(const WebString& description = WebString()); 75 BLINK_EXPORT void requestDenied(const WebString& description = WebString());
78 BLINK_EXPORT void requestFailedConstraint(const WebString& constraintName, c onst WebString& description = WebString()); 76 BLINK_EXPORT void requestFailedConstraint(const WebString& constraintName, c onst WebString& description = WebString());
79 BLINK_EXPORT void requestFailedUASpecific(const WebString& name, const WebSt ring& constraintName = WebString(), const WebString& description = WebString()); 77 BLINK_EXPORT void requestFailedUASpecific(const WebString& name, const WebSt ring& constraintName = WebString(), const WebString& description = WebString());
80 78
81 // DEPRECATED 79 // DEPRECATED
82 BLINK_EXPORT void requestFailed(const WebString& description = WebString()) { requestDenied(description); } 80 BLINK_EXPORT void requestFailed(const WebString& description = WebString()) { requestDenied(description); }
83 81
84 #if BLINK_IMPLEMENTATION 82 #if BLINK_IMPLEMENTATION
85 WebUserMediaRequest(blink::UserMediaRequest*); 83 WebUserMediaRequest(UserMediaRequest*);
86 operator blink::UserMediaRequest*() const; 84 operator UserMediaRequest*() const;
87 #endif 85 #endif
88 86
89 private: 87 private:
90 WebPrivatePtr<blink::UserMediaRequest> m_private; 88 WebPrivatePtr<UserMediaRequest> m_private;
91 }; 89 };
92 90
93 inline bool operator==(const WebUserMediaRequest& a, const WebUserMediaRequest& b) 91 inline bool operator==(const WebUserMediaRequest& a, const WebUserMediaRequest& b)
94 { 92 {
95 return a.equals(b); 93 return a.equals(b);
96 } 94 }
97 95
98 } // namespace blink 96 } // namespace blink
99 97
100 #endif // WebUserMediaRequest_h 98 #endif // WebUserMediaRequest_h
OLDNEW
« no previous file with comments | « public/web/WebUserGestureToken.h ('k') | public/web/WebWindowFeatures.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698