diff options
author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 14:38:28 +0000 |
---|---|---|
committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 14:38:28 +0000 |
commit | e8491289e4313d396ea9e1522209c1305d60a227 (patch) | |
tree | 4ca2b7eeb5e19ed0097a16bb4f3d1492c25ab4e5 /chrome/browser/plugin_exceptions_table_model.cc | |
parent | 65cc854b7dd673ba413da7364d5b0b3eb25da405 (diff) | |
download | chromium_src-e8491289e4313d396ea9e1522209c1305d60a227.zip chromium_src-e8491289e4313d396ea9e1522209c1305d60a227.tar.gz chromium_src-e8491289e4313d396ea9e1522209c1305d60a227.tar.bz2 |
Enable ContentSettingsPattern to match origins.
BUG=83200
TEST=content_settings_pattern_unittests.cc, content_settings_pattern_parser_unittests.cc
Review URL: http://codereview.chromium.org/6820039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_exceptions_table_model.cc')
-rw-r--r-- | chrome/browser/plugin_exceptions_table_model.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc index 81200fe..c6b310b 100644 --- a/chrome/browser/plugin_exceptions_table_model.cc +++ b/chrome/browser/plugin_exceptions_table_model.cc @@ -84,7 +84,7 @@ string16 PluginExceptionsTableModel::GetText(int row, int column_id) { SettingsEntry& entry = settings_[row]; if (column_id == IDS_EXCEPTIONS_PATTERN_HEADER || column_id == IDS_EXCEPTIONS_HOSTNAME_HEADER) { - return UTF8ToUTF16(entry.pattern.AsString()); + return UTF8ToUTF16(entry.pattern.ToString()); } else if (column_id == IDS_EXCEPTIONS_ACTION_HEADER) { switch (entry.setting) { case CONTENT_SETTING_ALLOW: |