| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/renderer/extensions/dom_activity_logger.h" | 5 #include "chrome/renderer/extensions/dom_activity_logger.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/common/extensions/dom_action_types.h" | 8 #include "chrome/common/extensions/dom_action_types.h" |
| 9 #include "chrome/common/extensions/extension_messages.h" | 9 #include "chrome/common/extensions/extension_messages.h" |
| 10 #include "chrome/renderer/chrome_render_process_observer.h" | 10 #include "chrome/renderer/chrome_render_process_observer.h" |
| 11 #include "chrome/renderer/extensions/activity_log_value_converter.h" |
| 11 #include "content/public/renderer/render_thread.h" | 12 #include "content/public/renderer/render_thread.h" |
| 12 #include "content/public/renderer/v8_value_converter.h" | |
| 13 #include "third_party/WebKit/public/platform/WebString.h" | 13 #include "third_party/WebKit/public/platform/WebString.h" |
| 14 #include "third_party/WebKit/public/web/WebDOMActivityLogger.h" | 14 #include "third_party/WebKit/public/web/WebDOMActivityLogger.h" |
| 15 #include "v8/include/v8.h" | 15 #include "v8/include/v8.h" |
| 16 | 16 |
| 17 using content::V8ValueConverter; | 17 using content::V8ValueConverter; |
| 18 | 18 |
| 19 namespace extensions { | 19 namespace extensions { |
| 20 | 20 |
| 21 DOMActivityLogger::DOMActivityLogger(const std::string& extension_id, | 21 DOMActivityLogger::DOMActivityLogger(const std::string& extension_id, |
| 22 const GURL& url, | 22 const GURL& url, |
| 23 const string16& title) | 23 const string16& title) |
| 24 : extension_id_(extension_id), url_(url), title_(title) { | 24 : extension_id_(extension_id), url_(url), title_(title) { |
| 25 } // namespace extensions | 25 } // namespace extensions |
| 26 | 26 |
| 27 void DOMActivityLogger::log( | 27 void DOMActivityLogger::log( |
| 28 const WebString& api_name, | 28 const WebString& api_name, |
| 29 int argc, | 29 int argc, |
| 30 const v8::Handle<v8::Value> argv[], | 30 const v8::Handle<v8::Value> argv[], |
| 31 const WebString& call_type) { | 31 const WebString& call_type) { |
| 32 scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create()); | 32 ActivityLogValueConverter converter; |
| 33 scoped_ptr<ListValue> argv_list_value(new ListValue()); | 33 scoped_ptr<ListValue> argv_list_value(new ListValue()); |
| 34 for (int i =0; i < argc; i++) { | 34 for (int i =0; i < argc; i++) { |
| 35 argv_list_value->Set( | 35 argv_list_value->Set( |
| 36 i, converter->FromV8Value(argv[i], v8::Context::GetCurrent())); | 36 i, converter.FromV8Value(argv[i], v8::Context::GetCurrent())); |
| 37 } | 37 } |
| 38 ExtensionHostMsg_DOMAction_Params params; | 38 ExtensionHostMsg_DOMAction_Params params; |
| 39 params.url = url_; | 39 params.url = url_; |
| 40 params.url_title = title_; | 40 params.url_title = title_; |
| 41 params.api_call = api_name.utf8(); | 41 params.api_call = api_name.utf8(); |
| 42 params.arguments.Swap(argv_list_value.get()); | 42 params.arguments.Swap(argv_list_value.get()); |
| 43 const std::string type = call_type.utf8(); | 43 const std::string type = call_type.utf8(); |
| 44 if (type == "Getter") | 44 if (type == "Getter") |
| 45 params.call_type = DomActionType::GETTER; | 45 params.call_type = DomActionType::GETTER; |
| 46 else if (type == "Setter") | 46 else if (type == "Setter") |
| (...skipping 15 matching lines...) Expand all Loading... |
| 62 // If there is no logger registered for world_id, construct a new logger | 62 // If there is no logger registered for world_id, construct a new logger |
| 63 // and register it with world_id. | 63 // and register it with world_id. |
| 64 if (!WebKit::hasDOMActivityLogger(world_id)) { | 64 if (!WebKit::hasDOMActivityLogger(world_id)) { |
| 65 DOMActivityLogger* logger = new DOMActivityLogger(extension_id, url, title); | 65 DOMActivityLogger* logger = new DOMActivityLogger(extension_id, url, title); |
| 66 WebKit::setDOMActivityLogger(world_id, logger); | 66 WebKit::setDOMActivityLogger(world_id, logger); |
| 67 } | 67 } |
| 68 } | 68 } |
| 69 | 69 |
| 70 } // namespace extensions | 70 } // namespace extensions |
| 71 | 71 |
| OLD | NEW |