bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1043 changes: 

- Linux: Improve label for JavaScript dialogs (issue #488).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1044 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-01-18 21:53:38 +00:00
parent b6ede2c8fa
commit 234b7804ef
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cef1/libcef/browser_webview_delegate_gtk.cc
View File

@ -14,6 +14,7 @@
#include "net/base/net_errors.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@ -200,6 +201,18 @@ bool ShowJSFileChooser(GtkWidget* window, FilePath* path) {
return (result == GTK_RESPONSE_ACCEPT);
}
std::string GetDialogLabel(WebKit::WebFrame* webframe,
const std::string& label) {
const GURL& url = webframe->document().url();
std::string urlStr;
if (!url.is_empty())
urlStr = url.host();
std::string labelStr = label;
if (!urlStr.empty())
labelStr += " - " + urlStr;
return labelStr;
}
} // namespace
// WebViewClient ---------------------------------------------------------------
@ -489,27 +502,27 @@ void BrowserWebViewDelegate::RegisterDragDrop() {
void BrowserWebViewDelegate::ShowJavaScriptAlert(
WebKit::WebFrame* webframe, const CefString& message) {
std::string messageStr(message);
std::string urlStr(browser_->GetMainFrame()->GetURL());
std::string labelStr(GetDialogLabel(webframe, "JavaScript Alert"));
gfx::NativeView view = browser_->UIT_GetMainWndHandle();
GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(view));
ShowJSAlertDialog(window,
static_cast<const gchar*>(urlStr.c_str()),
static_cast<const gchar*>(labelStr.c_str()),
static_cast<const gchar*>(messageStr.c_str()));
}
bool BrowserWebViewDelegate::ShowJavaScriptConfirm(
WebKit::WebFrame* webframe, const CefString& message) {
std::string messageStr(message);
std::string urlStr(browser_->GetMainFrame()->GetURL());
std::string labelStr(GetDialogLabel(webframe, "JavaScript Confirm"));
gfx::NativeView view = browser_->UIT_GetMainWndHandle();
GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(view));
return ShowJSConfirmDialog(
window,
static_cast<const gchar*>(urlStr.c_str()),
static_cast<const gchar*>(labelStr.c_str()),
static_cast<const gchar*>(messageStr.c_str()));
}
@ -518,7 +531,7 @@ bool BrowserWebViewDelegate::ShowJavaScriptPrompt(
const CefString& default_value, CefString* result) {
std::string messageStr(message);
std::string defaultStr(default_value);
std::string urlStr(browser_->GetMainFrame()->GetURL());
std::string labelStr(GetDialogLabel(webframe, "JavaScript Prompt"));
gfx::NativeView view = browser_->UIT_GetMainWndHandle();
GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(view));
@ -526,7 +539,7 @@ bool BrowserWebViewDelegate::ShowJavaScriptPrompt(
std::string return_val;
bool resp = ShowJSPromptDialog(
window,
static_cast<const gchar*>(urlStr.c_str()),
static_cast<const gchar*>(labelStr.c_str()),
static_cast<const gchar*>(messageStr.c_str()),
static_cast<const gchar*>(defaultStr.c_str()),
&return_val);