Introduce callback interface for running Javascript asynchronously in the renderer.

content/browser/renderer_host/render_view_host_impl.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/process_util.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 17 matching lines @@
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_DidFailProvisionalLoadWithError_Params;
 struct ViewHostMsg_OpenURL_Params;
 struct ViewHostMsg_ShowPopup_Params;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_PostMessage_Params;
 struct ViewMsg_StopFinding_Params;
 
 namespace base {
 class ListValue;
+class Value;
 }
 
 namespace ui {
 class Range;
 struct SelectedFileInfo;
 }
 
 namespace content {
 
 class ChildProcessSecurityPolicyImpl;
@@ skipping 17 matching lines @@
 class ExecuteNotificationObserver : public NotificationObserver {
  public:
   explicit ExecuteNotificationObserver(int id);
   virtual ~ExecuteNotificationObserver();
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   int id() const { return id_; }
 
-  Value* value() const { return value_.get(); }
+  base::Value* value() const { return value_.get(); }
 
  private:
   int id_;
-  scoped_ptr<Value> value_;
+  scoped_ptr<base::Value> value_;
 
   DISALLOW_COPY_AND_ASSIGN(ExecuteNotificationObserver);
 };
 
 #if defined(COMPILER_MSVC)
 // RenderViewHostImpl is the bottom of a diamond-shaped hierarchy,
 // with RenderWidgetHost at the root. VS warns when methods from the
 // root are overridden in only one of the base classes and not both
 // (in this case, RenderWidgetHostImpl provides implementations of
 // many of the methods).  This is a silly warning when dealing with
@@ skipping 89 matching lines @@
   virtual void ExecuteCustomContextMenuCommand(
       int action, const CustomContextMenuContext& context) OVERRIDE;
   virtual void ExecuteMediaPlayerActionAtLocation(
       const gfx::Point& location,
       const WebKit::WebMediaPlayerAction& action) OVERRIDE;
   virtual void ExecuteJavascriptInWebFrame(const string16& frame_xpath,
                                            const string16& jscript) OVERRIDE;
   virtual int ExecuteJavascriptInWebFrameNotifyResult(
       const string16& frame_xpath,
       const string16& jscript) OVERRIDE;
-  virtual Value* ExecuteJavascriptAndGetValue(const string16& frame_xpath,
-                                              const string16& jscript) OVERRIDE;
+  virtual void ExecuteJavascriptInWebFrameCallbackResult(
+      const string16& frame_xpath,
+      const string16& jscript,
+      const JavascriptResultCallback& callback) OVERRIDE;
+  virtual base::Value* ExecuteJavascriptAndGetValue(
+      const string16& frame_xpath,
+      const string16& jscript) OVERRIDE;
   virtual void ExecutePluginActionAtLocation(
       const gfx::Point& location,
       const WebKit::WebPluginAction& action) OVERRIDE;
   virtual void ExitFullscreen() OVERRIDE;
   virtual void Find(int request_id, const string16& search_text,
                     const WebKit::WebFindOptions& options) OVERRIDE;
   virtual void StopFinding(StopFindAction action) OVERRIDE;
   virtual void FirePageBeforeUnload(bool for_cross_site_transition) OVERRIDE;
   virtual void FilesSelectedInChooser(
       const std::vector<ui::SelectedFileInfo>& files,
@@ skipping 442 matching lines @@
   bool has_timed_out_on_unload_;
 
   // Valid only when is_waiting_for_beforeunload_ack_ or
   // is_waiting_for_unload_ack_ is true.  This tells us if the unload request
   // is for closing the entire tab ( = false), or only this RenderViewHost in
   // the case of a cross-site transition ( = true).
   bool unload_ack_is_for_cross_site_transition_;
 
   bool are_javascript_messages_suppressed_;
 
+  // The mapping of pending javascript calls created by
+  // ExecuteJavascriptInWebFrameCallbackResult and their corresponding
+  // callbacks.
+  std::map<int, JavascriptResultCallback> javascript_callbacks_;
+
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
   // The session storage namespace to be used by the associated render view.
   scoped_refptr<SessionStorageNamespaceImpl> session_storage_namespace_;
 
   // Whether the accessibility tree should be saved, for unit testing.
   bool save_accessibility_tree_for_testing_;
 
   // A JSON serialized representation of the frame tree for the current document
@@ skipping 27 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_