Revert 266157 "Extend DOMActivityLogger interface for upcoming c..."

trunk/src/chrome/renderer/extensions/dom_activity_logger.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_EXTENSIONS_DOM_ACTIVITY_LOGGER_H_
 #define CHROME_RENDERER_EXTENSIONS_DOM_ACTIVITY_LOGGER_H_
 
 #include <string>
 
 #include "base/strings/string_piece.h"
-#include "chrome/common/extensions/dom_action_types.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDOMActivityLogger.h"
 #include "url/gurl.h"
 #include "v8/include/v8.h"
 
-namespace base {
-class ListValue;
-}
-
 namespace content {
 class V8ValueConverter;
 }
 
 namespace extensions {
 
+class ActivityLogConverterStrategy;
+
 // Used to log DOM API calls from within WebKit. The events are sent via IPC to
 // extensions::ActivityLog for recording and display.
 class DOMActivityLogger: public blink::WebDOMActivityLogger {
  public:
   static const int kMainWorldId = 0;
   explicit DOMActivityLogger(const std::string& extension_id);
   virtual ~DOMActivityLogger();
 
-  // This will soon be deprecated, and converted to the logX methods below.
+  // Marshalls the arguments into an ExtensionHostMsg_DOMAction_Params
+  // and sends it over to the browser (via IPC) for appending it to the
+  // extension activity log.
+  // (Overrides the log method in blink::WebDOMActivityLogger)
   virtual void log(const blink::WebString& api_name,
                    int argc,
                    const v8::Handle<v8::Value> argv[],
                    const blink::WebString& call_type,
                    const blink::WebURL& url,
-                   const blink::WebString& title);
+                   const blink::WebString& title) OVERRIDE;
 
   // Check (using the WebKit API) if there is no logger attached to the world
   // corresponding to world_id, and if so, construct a new logger and attach it.
   // world_id = 0 indicates the main world.
   static void AttachToWorld(int world_id,
                             const std::string& extension_id);
 
  private:
-  // blink::WebDOMActivityLogger implementation.
-  // Marshals the arguments into an ExtensionHostMsg_DOMAction_Params and sends
-  // it over to the browser (via IPC) for appending it to the extension activity
-  // log.
-  // These methods don't have the OVERRIDE keyword due to the complexities it
-  // introduces when changes blink apis.
-  virtual void logGetter(const blink::WebString& api_name,
-                         const blink::WebURL& url,
-                         const blink::WebString& title);
-  virtual void logSetter(const blink::WebString& api_name,
-                         const v8::Handle<v8::Value>& new_value,
-                         const blink::WebURL& url,
-                         const blink::WebString& title);
-  virtual void logSetter(const blink::WebString& api_name,
-                         const v8::Handle<v8::Value>& new_value,
-                         const v8::Handle<v8::Value>& old_value,
-                         const blink::WebURL& url,
-                         const blink::WebString& title);
-  virtual void logMethod(const blink::WebString& api_name,
-                         int argc,
-                         const v8::Handle<v8::Value>* argv,
-                         const blink::WebURL& url,
-                         const blink::WebString& title);
-
-  // Helper function to actually send the message across IPC.
-  void SendDomActionMessage(const std::string& api_call,
-                            const GURL& url,
-                            const base::string16& url_title,
-                            DomActionType::Type call_type,
-                            scoped_ptr<base::ListValue> args);
-
-  // The id of the extension with which this logger is associated.
   std::string extension_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DOMActivityLogger);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_DOM_ACTIVITY_LOGGER_H_