chrome/browser/media/media_stream_devices_controller.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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/media/media_stream_devices_controller.cc

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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 side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/content_settings_details.h ('K') | « chrome/browser/extensions/extension_special_storage_policy_unittest.cc ('k') | chrome/browser/notifications/message_center_settings_controller.cc » ('j') | chrome/common/chrome_content_settings_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_devices_controller.cc

diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc

index 431af985362b043c48a232b1c535c8c0baebccfb..7c3cce5a4c2cf0e737f3a1acb3de0268aa8c2132 100644

--- a/chrome/browser/media/media_stream_devices_controller.cc

+++ b/chrome/browser/media/media_stream_devices_controller.cc

@@ -17,6 +17,7 @@

#include "chrome/browser/media/media_stream_capture_indicator.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/common/chrome_content_settings_client.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/content_settings.h"

#include "chrome/common/content_settings_pattern.h"

@@ -474,8 +475,9 @@ MediaStreamDevicesController::GetDevicePolicy(

std::string value;

for (size_t i = 0; i < list->GetSize(); ++i) {

if (list->GetString(i, &value)) {

+ content_settings::ChromeContentSettingsClient client;

ContentSettingsPattern pattern =

- ContentSettingsPattern::FromString(value);

+ ContentSettingsPattern::FromString(&client, value);

if (pattern == ContentSettingsPattern::Wildcard()) {

DLOG(WARNING) << "Ignoring wildcard URL pattern: " << value;

continue;