Chromium Code Reviews| Index: chrome/browser/extensions/extension_devtools_bridge.cc |
| diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc |
| index ff331b778fdb69a21494219c61fa95ed9c47e41d..176615e37317119cdb2e939e187c4e9b0907dc28 100644 |
| --- a/chrome/browser/extensions/extension_devtools_bridge.cc |
| +++ b/chrome/browser/extensions/extension_devtools_bridge.cc |
| @@ -4,10 +4,11 @@ |
| #include "chrome/browser/extensions/extension_devtools_bridge.h" |
| +#include "base/json/json_reader.h" |
| #include "base/json/json_writer.h" |
| #include "base/message_loop.h" |
| -#include "base/string_util.h" |
| #include "base/stringprintf.h" |
| +#include "base/string_util.h" |
| #include "base/values.h" |
| #include "chrome/browser/extensions/extension_devtools_events.h" |
| #include "chrome/browser/extensions/extension_devtools_manager.h" |
| @@ -105,9 +106,10 @@ void ExtensionDevToolsBridge::InspectedContentsClosing() { |
| // TODO(knorton): Remove this event in favor of the standard tabs.onRemoved |
| // event in extensions. |
| - std::string json("[{}]"); |
| + base::ListValue* arguments = new base::ListValue(); |
|
miket_OOO
2012/07/10 22:33:19
args?
|
| + arguments->Set(0, new base::DictionaryValue()); |
| profile_->GetExtensionEventRouter()->DispatchEventToRenderers( |
| - on_tab_close_event_name_, json, profile_, GURL(), |
| + on_tab_close_event_name_, arguments, profile_, GURL(), |
| extensions::EventFilteringInfo()); |
| // This may result in this object being destroyed. |
| @@ -118,9 +120,11 @@ void ExtensionDevToolsBridge::DispatchOnInspectorFrontend( |
| const std::string& data) { |
| DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI); |
| - std::string json = base::StringPrintf("[%s]", data.c_str()); |
| + base::ListValue* arguments = new base::ListValue(); |
|
miket_OOO
2012/07/10 22:33:19
same
|
| + arguments->Append(base::JSONReader::Read(data)); |
| + |
| profile_->GetExtensionEventRouter()->DispatchEventToRenderers( |
| - on_page_event_name_, json, profile_, GURL(), |
| + on_page_event_name_, arguments, profile_, GURL(), |
| extensions::EventFilteringInfo()); |
| } |