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

Unified Diff: content/public/browser/content_browser_client.h

Issue 2517953003: Move enable_webrtc to a buildflag header. (Closed)
Patch Set: Fix Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu_host_messages.h ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 96946a06bac2747889a3d4ad24e0346b69dd07fb..a04b768c1a9589613ca4175abcd996ca9f487702 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -26,6 +26,7 @@
#include "content/public/common/socket_permission_request.h"
#include "content/public/common/window_container_type.h"
#include "media/audio/audio_manager.h"
+#include "media/media_features.h"
#include "media/mojo/interfaces/remoting.mojom.h"
#include "net/base/mime_util.h"
#include "net/cookies/canonical_cookie.h"
@@ -371,14 +372,14 @@ class CONTENT_EXPORT ContentBrowserClient {
ResourceContext* context,
const std::vector<std::pair<int, int> >& render_frames);
-#if defined(ENABLE_WEBRTC)
+#if BUILDFLAG(ENABLE_WEBRTC)
// Allow the embedder to control if WebRTC identities are allowed to be cached
// and potentially reused for future requests (within the same origin).
// This is called on the IO thread.
virtual bool AllowWebRTCIdentityCache(const GURL& url,
const GURL& first_party_url,
ResourceContext* context);
-#endif // defined(ENABLE_WEBRTC)
+#endif // BUILDFLAG(ENABLE_WEBRTC)
// Allow the embedder to control whether we can use <keygen>.
virtual bool AllowKeygen(const GURL& url, content::ResourceContext* context);
« no previous file with comments | « content/common/gpu_host_messages.h ('k') | content/public/browser/content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698