chrome/browser/content_exceptions_table_model.cc - Issue 2878075: Introduce a resource identifier for content settings.

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/content_exceptions_table_model.cc

Issue 2878075: Introduce a resource identifier for content settings. (Closed)

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

Index: chrome/browser/content_exceptions_table_model.cc

diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc

index d7f1bb6fa8c80d23e449bac43336809113bbf44c..e8bb22fc69df5409cb4ff2d20164f36ee702bd67 100644

--- a/chrome/browser/content_exceptions_table_model.cc

+++ b/chrome/browser/content_exceptions_table_model.cc

@@ -19,9 +19,12 @@ ContentExceptionsTableModel::ContentExceptionsTableModel(

content_type_(type),

observer_(NULL) {

// Load the contents.

- map->GetSettingsForOneType(type, &entries_);

- if (off_the_record_map)

- off_the_record_map->GetSettingsForOneType(type, &off_the_record_entries_);

+ map->GetSettingsForOneType(type, "", &entries_);

+ if (off_the_record_map) {

+ off_the_record_map->GetSettingsForOneType(type,

+ "",

+ &off_the_record_entries_);

+ }

}

void ContentExceptionsTableModel::AddException(

@@ -35,7 +38,10 @@ void ContentExceptionsTableModel::AddException(

entries(is_off_the_record).push_back(

HostContentSettingsMap::PatternSettingPair(pattern, setting));

- map(is_off_the_record)->SetContentSetting(pattern, content_type_, setting);

+ map(is_off_the_record)->SetContentSetting(pattern,

+ content_type_,

+ "",

+ setting);

if (observer_)

observer_->OnItemsAdded(insert_position, 1);

}

@@ -47,7 +53,7 @@ void ContentExceptionsTableModel::RemoveException(int row) {

const HostContentSettingsMap::PatternSettingPair& pair = entry_at(row);

map(is_off_the_record)->SetContentSetting(

- pair.first, content_type_, CONTENT_SETTING_DEFAULT);

+ pair.first, content_type_, "", CONTENT_SETTING_DEFAULT);

entries(is_off_the_record).erase(

entries(is_off_the_record).begin() + position_to_delete);

if (observer_)