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

Side by Side Diff: third_party/WebKit/public/web/WebMediaDevicesRequest.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 { 48 {
49 assign(other); 49 assign(other);
50 return *this; 50 return *this;
51 } 51 }
52 52
53 BLINK_EXPORT void reset(); 53 BLINK_EXPORT void reset();
54 bool isNull() const { return m_private.isNull(); } 54 bool isNull() const { return m_private.isNull(); }
55 BLINK_EXPORT bool equals(const WebMediaDevicesRequest&) const; 55 BLINK_EXPORT bool equals(const WebMediaDevicesRequest&) const;
56 BLINK_EXPORT void assign(const WebMediaDevicesRequest&); 56 BLINK_EXPORT void assign(const WebMediaDevicesRequest&);
57 57
58 BLINK_EXPORT WebSecurityOrigin securityOrigin() const; 58 BLINK_EXPORT WebSecurityOrigin getSecurityOrigin() const;
59 BLINK_EXPORT WebDocument ownerDocument() const; 59 BLINK_EXPORT WebDocument ownerDocument() const;
60 60
61 BLINK_EXPORT void requestSucceeded(WebVector<WebMediaDeviceInfo>); 61 BLINK_EXPORT void requestSucceeded(WebVector<WebMediaDeviceInfo>);
62 62
63 #if BLINK_IMPLEMENTATION 63 #if BLINK_IMPLEMENTATION
64 WebMediaDevicesRequest(MediaDevicesRequest*); 64 WebMediaDevicesRequest(MediaDevicesRequest*);
65 operator MediaDevicesRequest*() const; 65 operator MediaDevicesRequest*() const;
66 #endif 66 #endif
67 67
68 private: 68 private:
69 WebPrivatePtr<MediaDevicesRequest> m_private; 69 WebPrivatePtr<MediaDevicesRequest> m_private;
70 }; 70 };
71 71
72 inline bool operator==(const WebMediaDevicesRequest& a, const WebMediaDevicesReq uest& b) 72 inline bool operator==(const WebMediaDevicesRequest& a, const WebMediaDevicesReq uest& b)
73 { 73 {
74 return a.equals(b); 74 return a.equals(b);
75 } 75 }
76 76
77 } // namespace blink 77 } // namespace blink
78 78
79 #endif // WebMediaDevicesRequest_h 79 #endif // WebMediaDevicesRequest_h
OLDNEW
« no previous file with comments | « third_party/WebKit/public/web/WebGeolocationPermissionRequest.h ('k') | third_party/WebKit/public/web/WebUserMediaRequest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698