chrome/browser/ui/webui/options/website_settings_handler.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/ui/webui/options/website_settings_handler.cc

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

Patch Set: Removed the clients 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

« no previous file with comments | « chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc ('k') | chrome/common/content_settings_pattern.h » ('j') | chrome/common/content_settings_pattern.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/website_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/website_settings_handler.cc b/chrome/browser/ui/webui/options/website_settings_handler.cc

index 8eca40c1451144c69a13e1109de3e4bbae0a5de8..681f405ea4a2987d96c04358cb5f3218c860449b 100644

--- a/chrome/browser/ui/webui/options/website_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/website_settings_handler.cc

@@ -8,6 +8,7 @@

#include "chrome/browser/content_settings/host_content_settings_map.h"

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

#include "content/public/browser/web_ui.h"

+#include "extensions/common/constants.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/time_format.h"

#include "ui/base/text/bytes_formatting.h"

@@ -137,7 +138,8 @@ void WebsiteSettingsHandler::UpdateOrigins() {

continue;

}

- std::string origin = it->primary_pattern.ToString();

+ std::string origin =

+ it->primary_pattern.ToString(extensions::kExtensionScheme);

// Mediastream isn't set unless both mic and camera are set to the same.

if (last_setting == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {