summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 10:26:03 +0000
committerlazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 10:26:03 +0000
commit858d789c57548dee13416f414fe19e576c464bee (patch)
tree015c22da87ee6d7d6c83f9fdcc3c33c5e0d605ca /extensions
parent7317302bfee0b85e77502e7261413a4fae245e33 (diff)
downloadchromium_src-858d789c57548dee13416f414fe19e576c464bee.zip
chromium_src-858d789c57548dee13416f414fe19e576c464bee.tar.gz
chromium_src-858d789c57548dee13416f414fe19e576c464bee.tar.bz2
Make EventFilteringInfo::IsEmpty() take has_instance_id_ into account.
We should not consider event filtering info to be empty if a filter is for a <webview> guest, i.e. it has an instance id. This probably was an oversight while adding has_instance_id_/instance_id_ to EventFilteringInfo. BUG=None Test=None Review URL: https://codereview.chromium.org/140633003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/event_filtering_info.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/common/event_filtering_info.cc b/extensions/common/event_filtering_info.cc
index cc46f96..877f2c5 100644
--- a/extensions/common/event_filtering_info.cc
+++ b/extensions/common/event_filtering_info.cc
@@ -46,7 +46,7 @@ scoped_ptr<base::Value> EventFilteringInfo::AsValue() const {
}
bool EventFilteringInfo::IsEmpty() const {
- return !has_url_ && service_type_.empty();
+ return !has_url_ && service_type_.empty() && !has_instance_id_;
}
} // namespace extensions