chrome/browser/ui/cocoa/content_exceptions_window_controller.mm - Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

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/cocoa/content_exceptions_window_controller.mm

Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings

Patch Set: updates Created 10 years 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/tab_contents/tab_contents.cc ('k') | chrome/browser/ui/cocoa/content_exceptions_window_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_exceptions_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm

index 1a6aa74b12a06009f2fbb0ff2836d83fc1a8da1c..e9a426f6e7e737de4d7c4e184889b725d61beb43 100644

--- a/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm

+++ b/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm

@@ -49,7 +49,7 @@

forString:(NSString*)string

errorDescription:(NSString**)error {

if ([string length]) {

- if (HostContentSettingsMap::Pattern(

+ if (ContentSettingsPattern(

base::SysNSStringToUTF8(string)).IsValid()) {

*object = string;

return YES;

@@ -295,7 +295,7 @@ static ContentExceptionsWindowController*

return;

}

newException_.reset(new HostContentSettingsMap::PatternSettingPair);

- newException_->first = HostContentSettingsMap::Pattern(

+ newException_->first = ContentSettingsPattern(

l10n_util::GetStringUTF8(IDS_EXCEPTIONS_SAMPLE_PATTERN));

newException_->second = CONTENT_SETTING_BLOCK;

[tableView_ reloadData];

@@ -418,8 +418,7 @@ static ContentExceptionsWindowController*

// Modify it.

NSString* identifier = [tableColumn identifier];

if ([identifier isEqualToString:@"pattern"]) {

- entry.first = HostContentSettingsMap::Pattern(

- base::SysNSStringToUTF8(object));

+ entry.first = ContentSettingsPattern(base::SysNSStringToUTF8(object));

}

if ([identifier isEqualToString:@"action"]) {

int index = [object intValue];