Index: chrome/renderer/extensions/api_activity_logger.cc |
diff --git a/chrome/renderer/extensions/api_activity_logger.cc b/chrome/renderer/extensions/api_activity_logger.cc |
index 94bbc39691025f7ab7663781cec99c7219433fb7..d0b664757ba9adef5c42fc3e7fb27d080643528c 100644 |
--- a/chrome/renderer/extensions/api_activity_logger.cc |
+++ b/chrome/renderer/extensions/api_activity_logger.cc |
@@ -23,22 +23,24 @@ APIActivityLogger::APIActivityLogger( |
// static |
v8::Handle<v8::Value> APIActivityLogger::LogActivity( |
const v8::Arguments& args) { |
- DCHECK_GT(args.Length(), 2); |
+ DCHECK_GT(args.Length(), 3); |
DCHECK(args[0]->IsString()); |
DCHECK(args[1]->IsString()); |
- DCHECK(args[2]->IsArray()); |
+ DCHECK(args[2]->IsString()); |
+ DCHECK(args[3]->IsArray()); |
// Get the simple values. |
- std::string ext_id = *v8::String::AsciiValue(args[0]->ToString()); |
+ std::string call_type = *v8::String::AsciiValue(args[0]->ToString()); |
+ std::string ext_id = *v8::String::AsciiValue(args[1]->ToString()); |
ExtensionHostMsg_APIAction_Params params; |
- params.api_call = *v8::String::AsciiValue(args[1]->ToString()); |
- if (args.Length() == 4) // Extras are optional. |
- params.extra = *v8::String::AsciiValue(args[3]->ToString()); |
+ params.api_call = *v8::String::AsciiValue(args[2]->ToString()); |
+ if (args.Length() == 5) // Extras are optional. |
+ params.extra = *v8::String::AsciiValue(args[4]->ToString()); |
else |
params.extra = ""; |
// Get the array of api call arguments. |
- v8::Local<v8::Array> arg_array = v8::Local<v8::Array>::Cast(args[2]); |
+ v8::Local<v8::Array> arg_array = v8::Local<v8::Array>::Cast(args[3]); |
if (arg_array->Length() > 0) { |
scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create()); |
scoped_ptr<ListValue> arg_list(new ListValue()); |
@@ -51,7 +53,9 @@ v8::Handle<v8::Value> APIActivityLogger::LogActivity( |
} |
content::RenderThread::Get()->Send( |
- new ExtensionHostMsg_AddAPIActionToActivityLog(ext_id, params)); |
+ new ExtensionHostMsg_AddAPIActionToActivityLog(call_type, |
Matt Perry
2013/04/09 20:56:59
It'd be better if call_type were converted to an e
|
+ ext_id, |
+ params)); |
return v8::Undefined(); |
} |