Move modal dialogs from WebViewClient to WebFrameClient, part 1/3.

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 6ccc95b23312a202a6df0140a0dcd309937d5c90..a9cca9f14f77efd714685e6d164e8fc884d5aa20 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -14,6 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/process/process_handle.h"
+#include "content/public/common/javascript_message_type.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/renderer/renderer_webcookiejar_impl.h"
@@ -282,6 +283,17 @@ class CONTENT_EXPORT RenderFrameImpl
                                      bool is_new_navigation);
   virtual void didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame);
   virtual void didChangeSelection(bool is_empty_selection);
+  virtual void runModalAlertDialog(blink::WebFrame* frame,

[jam, 2014/04/05 00:21:38]

I'm guessing these methods are moving from WebViewClient to WebFrameClient? can
the new ones not have a frame pointer?

[Avi (use Gerrit), 2014/04/07 16:12:06]

The problem is that RenderViewImpl is both a WebFrameClient as well as a
WebViewClient. If I change the parameters I need to also change the name, or
else I get an error that these hide their overloaded virtual functions.

+                                   const blink::WebString& message);
+  virtual bool runModalConfirmDialog(blink::WebFrame* frame,
+                                     const blink::WebString& message);
+  virtual bool runModalPromptDialog(blink::WebFrame* frame,
+                                    const blink::WebString& message,
+                                    const blink::WebString& default_value,
+                                    blink::WebString* actual_value);
+  virtual bool runModalBeforeUnloadDialog(blink::WebFrame* frame,
+                                          bool is_reload,
+                                          const blink::WebString& message);
   virtual void showContextMenu(const blink::WebContextMenuData& data);
   virtual void clearContextMenu();
   virtual void willRequestAfterPreconnect(blink::WebLocalFrame* frame,
@@ -445,6 +457,12 @@ class CONTENT_EXPORT RenderFrameImpl
       const gfx::Range& selection_range,
       const ContextMenuParams& params);
 
+  bool RunJavaScriptMessage(JavaScriptMessageType type,
+                            const base::string16& message,
+                            const base::string16& default_value,
+                            const GURL& frame_url,
+                            base::string16* result);
+
   // Stores the WebLocalFrame we are associated with.
   blink::WebLocalFrame* frame_;