Make JavaScript alerts reflect the URL of the frame they came from, not the...

webkit/glue/webview_delegate.h

 // Copyright (c) 2006-2008 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.
 
 // WebCore provides hooks for several kinds of functionality, allowing separate
 // classes termed "delegates" to receive notifications (in the form of direct
 // function calls) when certain events are about to occur or have just occurred.
 // In some cases, the delegate implements the needed functionality; in others,
 // the delegate has some control over the behavior but doesn't actually
 // implement it.  For example, the UI delegate is responsible for showing a
@@ skipping 480 matching lines @@
 
   // Asks the browser to show a modal HTML dialog.  The dialog is passed the
   // given arguments as a JSON string, and returns its result as a JSON string
   // through json_retval.
   virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,
                                    const std::string& json_arguments,
                                    std::string* json_retval) {
   }
 
   // Displays a JavaScript alert panel associated with the given view. Clients
-  // should visually indicate that this panel comes from JavaScript. The panel
+  // should visually indicate that this panel comes from JavaScript and some
+  // information about the originating frame (at least the domain). The panel
   // should have a single OK button.
-  virtual void RunJavaScriptAlert(WebView* webview,
+  virtual void RunJavaScriptAlert(WebFrame* webframe,
                                   const std::wstring& message) {
   }
 
   // Displays a JavaScript confirm panel associated with the given view.
   // Clients should visually indicate that this panel comes
   // from JavaScript. The panel should have two buttons, e.g. "OK" and
   // "Cancel". Returns true if the user hit OK, or false if the user hit Cancel.
-  virtual bool RunJavaScriptConfirm(WebView* webview,
+  virtual bool RunJavaScriptConfirm(WebFrame* webframe,
                                     const std::wstring& message) {
     return false;
   }
 
   // Displays a JavaScript text input panel associated with the given view.
   // Clients should visually indicate that this panel comes from JavaScript.
   // The panel should have two buttons, e.g. "OK" and "Cancel", and an area to
   // type text. The default_value should appear as the initial text in the
   // panel when it is shown. If the user hit OK, returns true and fills result
   // with the text in the box.  The value of result is undefined if the user
   // hit Cancel.
-  virtual bool RunJavaScriptPrompt(WebView* webview,
+  virtual bool RunJavaScriptPrompt(WebFrame* webframe,
                                    const std::wstring& message,
                                    const std::wstring& default_value,
                                    std::wstring* result) {
     return false;
   }
 
   // Sets the status bar text.
   virtual void SetStatusbarText(WebView* webview,
                                 const std::wstring& message) { }
 
   // Displays a "before unload" confirm panel associated with the given view.
   // The panel should have two buttons, e.g. "OK" and "Cancel", where OK means
   // that the navigation should continue, and Cancel means that the navigation
   // should be cancelled, leaving the user on the current page.  Returns true
   // if the user hit OK, or false if the user hit Cancel.
-  virtual bool RunBeforeUnloadConfirm(WebView* webview,
+  virtual bool RunBeforeUnloadConfirm(WebFrame* webframe,
                                       const std::wstring& message) {
     return true;  // OK, continue to navigate away
   }
 
   // Tells the client that we're hovering over a link with a given URL,
   // if the node is not a link, the URL will be an empty GURL.
   virtual void UpdateTargetURL(WebView* webview,
                                const GURL& url) {
   }
 
@@ skipping 222 matching lines @@
   virtual void DidAddHistoryItem() { }
 
   WebViewDelegate() { }
   virtual ~WebViewDelegate() { }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebViewDelegate);
 };
 
 #endif  // WEBKIT_GLUE_WEBVIEW_DELEGATE_H_