chrome/browser/ui/extensions/shell_window.cc - Issue 10649003: Move each permission classes to its own files in extensions/permissions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/extensions/shell_window.cc

Issue 10649003: Move each permission classes to its own files in extensions/permissions (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase on HEAD Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/shell_window.cc

diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc

index d4475961d1c1b495856ae89ccf081fccb7060b26..0d4559259cc0057c6e13009d14f6af10a22d7113 100644

--- a/chrome/browser/ui/extensions/shell_window.cc

+++ b/chrome/browser/ui/extensions/shell_window.cc

@@ -43,6 +43,7 @@ using content::RenderViewHost;

using content::ResourceDispatcherHost;

using content::SiteInstance;

using content::WebContents;

+using extensions::APIPermission;

namespace {

const int kDefaultWidth = 512;

@@ -154,14 +155,14 @@ void ShellWindow::RequestMediaAccessPermission(

content::MediaStreamDeviceMap::const_iterator iter =

request->devices.find(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE);

if (iter != request->devices.end() &&

- extension()->HasAPIPermission(ExtensionAPIPermission::kAudioCapture) &&

+ extension()->HasAPIPermission(APIPermission::kAudioCapture) &&

!iter->second.empty()) {

devices.push_back(iter->second[0]);

}

iter = request->devices.find(content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE);

if (iter != request->devices.end() &&

- extension()->HasAPIPermission(ExtensionAPIPermission::kVideoCapture) &&

+ extension()->HasAPIPermission(APIPermission::kVideoCapture) &&

!iter->second.empty()) {

devices.push_back(iter->second[0]);

}