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

Side by Side Diff: chrome/browser/ui/media_utils.cc

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/media_utils.h" 5 #include "chrome/browser/ui/media_utils.h"
6 6
7 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" 7 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "extensions/features/features.h"
10 11
11 #if defined(ENABLE_EXTENSIONS) 12 #if BUILDFLAG(ENABLE_EXTENSIONS)
12 #include "extensions/browser/extension_registry.h" 13 #include "extensions/browser/extension_registry.h"
13 #include "extensions/common/constants.h" 14 #include "extensions/common/constants.h"
14 #endif 15 #endif
15 16
16 namespace { 17 namespace {
17 18
18 #if defined(ENABLE_EXTENSIONS) 19 #if BUILDFLAG(ENABLE_EXTENSIONS)
19 const extensions::Extension* GetExtensionForOrigin(Profile* profile, 20 const extensions::Extension* GetExtensionForOrigin(Profile* profile,
20 const GURL& security_origin) { 21 const GURL& security_origin) {
21 if (!security_origin.SchemeIs(extensions::kExtensionScheme)) 22 if (!security_origin.SchemeIs(extensions::kExtensionScheme))
22 return NULL; 23 return NULL;
23 24
24 const extensions::Extension* extension = 25 const extensions::Extension* extension =
25 extensions::ExtensionRegistry::Get(profile)->enabled_extensions().GetByID( 26 extensions::ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(
26 security_origin.host()); 27 security_origin.host());
27 DCHECK(extension); 28 DCHECK(extension);
28 return extension; 29 return extension;
29 } 30 }
30 #endif 31 #endif
31 32
32 } // namespace 33 } // namespace
33 34
34 void RequestMediaAccessPermission( 35 void RequestMediaAccessPermission(
35 content::WebContents* web_contents, 36 content::WebContents* web_contents,
36 Profile* profile, 37 Profile* profile,
37 const content::MediaStreamRequest& request, 38 const content::MediaStreamRequest& request,
38 const content::MediaResponseCallback& callback) { 39 const content::MediaResponseCallback& callback) {
39 const extensions::Extension* extension = NULL; 40 const extensions::Extension* extension = NULL;
40 #if defined(ENABLE_EXTENSIONS) 41 #if BUILDFLAG(ENABLE_EXTENSIONS)
41 extension = GetExtensionForOrigin(profile, request.security_origin); 42 extension = GetExtensionForOrigin(profile, request.security_origin);
42 #endif 43 #endif
43 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( 44 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
44 web_contents, request, callback, extension); 45 web_contents, request, callback, extension);
45 } 46 }
46 47
47 bool CheckMediaAccessPermission(content::WebContents* web_contents, 48 bool CheckMediaAccessPermission(content::WebContents* web_contents,
48 const GURL& security_origin, 49 const GURL& security_origin,
49 content::MediaStreamType type) { 50 content::MediaStreamType type) {
50 #if defined(ENABLE_EXTENSIONS) 51 #if BUILDFLAG(ENABLE_EXTENSIONS)
51 Profile* profile = 52 Profile* profile =
52 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 53 Profile::FromBrowserContext(web_contents->GetBrowserContext());
53 const extensions::Extension* extension = 54 const extensions::Extension* extension =
54 GetExtensionForOrigin(profile, security_origin); 55 GetExtensionForOrigin(profile, security_origin);
55 if (extension) { 56 if (extension) {
56 return MediaCaptureDevicesDispatcher::GetInstance() 57 return MediaCaptureDevicesDispatcher::GetInstance()
57 ->CheckMediaAccessPermission( 58 ->CheckMediaAccessPermission(
58 web_contents, security_origin, type, extension); 59 web_contents, security_origin, type, extension);
59 } 60 }
60 return MediaCaptureDevicesDispatcher::GetInstance() 61 return MediaCaptureDevicesDispatcher::GetInstance()
61 ->CheckMediaAccessPermission(web_contents, security_origin, type); 62 ->CheckMediaAccessPermission(web_contents, security_origin, type);
62 #else 63 #else
63 return MediaCaptureDevicesDispatcher::GetInstance() 64 return MediaCaptureDevicesDispatcher::GetInstance()
64 ->CheckMediaAccessPermission(web_contents, security_origin, type); 65 ->CheckMediaAccessPermission(web_contents, security_origin, type);
65 #endif 66 #endif
66 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/login/login_handler.cc ('k') | chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698