OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "extensions/common/event_filtering_info.h" | 5 #include "extensions/common/event_filtering_info.h" |
6 | 6 |
7 #include "base/json/json_writer.h" | 7 #include "base/json/json_writer.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 | 9 |
10 namespace extensions { | 10 namespace extensions { |
(...skipping 20 matching lines...) Expand all Loading... |
31 scoped_ptr<base::Value> EventFilteringInfo::AsValue() const { | 31 scoped_ptr<base::Value> EventFilteringInfo::AsValue() const { |
32 if (IsEmpty()) | 32 if (IsEmpty()) |
33 return scoped_ptr<base::Value>(base::Value::CreateNullValue()); | 33 return scoped_ptr<base::Value>(base::Value::CreateNullValue()); |
34 | 34 |
35 scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue); | 35 scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue); |
36 if (has_url_) | 36 if (has_url_) |
37 result->SetString("url", url_.spec()); | 37 result->SetString("url", url_.spec()); |
38 | 38 |
39 if (has_instance_id_) | 39 if (has_instance_id_) |
40 result->SetInteger("instanceId", instance_id_); | 40 result->SetInteger("instanceId", instance_id_); |
| 41 |
| 42 if (!service_type_.empty()) |
| 43 result->SetString("serviceType", service_type_); |
| 44 |
41 return result.PassAs<base::Value>(); | 45 return result.PassAs<base::Value>(); |
42 } | 46 } |
43 | 47 |
44 bool EventFilteringInfo::IsEmpty() const { | 48 bool EventFilteringInfo::IsEmpty() const { |
45 return !has_url_; | 49 return !has_url_ && service_type_.empty(); |
46 } | 50 } |
47 | 51 |
48 } // namespace extensions | 52 } // namespace extensions |
OLD | NEW |