Update to Chromium revision 149431.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@730 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
2025-06-05 21:39:12 +02:00 · 2012-08-04 00:59:58 +00:00
parent c91f8132d5
commit b39ca211ae
33 changed files with 323 additions and 200 deletions
--- a/libcef/browser/javascript_dialog_gtk.cc
+++ b/libcef/browser/javascript_dialog_gtk.cc
@ -0,0 +1,135 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors.
+// Portions 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.
+
+#include "libcef/browser/javascript_dialog.h"
+#include "libcef/browser/browser_host_impl.h"
+#include "libcef/browser/javascript_dialog_creator.h"
+
+#include <gtk/gtk.h>
+
+#include "base/logging.h"
+#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
+
+namespace {
+
+const char kPromptTextId[] = "cef_prompt_text";
+
+// If there's a text entry in the dialog, get the text from the first one and
+// return it.
+string16 GetPromptText(GtkDialog* dialog) {
+  GtkWidget* widget = static_cast<GtkWidget*>(
+      g_object_get_data(G_OBJECT(dialog), kPromptTextId));
+  if (widget)
+    return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(widget)));
+  return string16();
+}
+
+}  // namespace
+
+CefJavaScriptDialog::CefJavaScriptDialog(
+    CefJavaScriptDialogCreator* creator,
+    content::JavaScriptMessageType message_type,
+    const string16& display_url,
+    const string16& message_text,
+    const string16& default_prompt_text,
+    const content::JavaScriptDialogCreator::DialogClosedCallback& callback)
+    : creator_(creator),
+      callback_(callback) {
+  GtkButtonsType buttons = GTK_BUTTONS_NONE;
+  GtkMessageType gtk_message_type = GTK_MESSAGE_OTHER;
+  std::string title;
+
+  switch (message_type) {
+    case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
+      buttons = GTK_BUTTONS_NONE;
+      gtk_message_type = GTK_MESSAGE_WARNING;
+      title = "JavaScript Alert";
+      break;
+
+    case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
+      buttons = GTK_BUTTONS_CANCEL;
+      gtk_message_type = GTK_MESSAGE_QUESTION;
+      title = "JavaScript Confirm";
+      break;
+
+    case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT:
+      buttons = GTK_BUTTONS_CANCEL;
+      gtk_message_type = GTK_MESSAGE_QUESTION;
+      title = "JavaScript Prompt";
+      break;
+
+    default:
+      NOTREACHED();
+  }
+
+  if (!display_url.empty()) {
+    title += " - ";
+    title += UTF16ToUTF8(display_url).c_str();
+  }
+
+  GtkWidget* window =
+      gtk_widget_get_ancestor(
+          GTK_WIDGET(creator->browser()->GetWindowHandle()),
+          GTK_TYPE_WINDOW);
+  gtk_dialog_ = gtk_message_dialog_new(GTK_WINDOW(window),
+                                       GTK_DIALOG_MODAL,
+                                       gtk_message_type,
+                                       buttons,
+                                       "%s",
+                                       UTF16ToUTF8(message_text).c_str());
+  g_signal_connect(gtk_dialog_,
+                   "delete-event",
+                   G_CALLBACK(gtk_widget_hide_on_delete),
+                   NULL);
+
+  gtk_window_set_title(GTK_WINDOW(gtk_dialog_), title.c_str());
+
+  GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(gtk_dialog_),
+                                               GTK_STOCK_OK,
+                                               GTK_RESPONSE_OK);
+
+  if (message_type != content::JAVASCRIPT_MESSAGE_TYPE_PROMPT)
+    gtk_widget_grab_focus(ok_button);
+
+  if (message_type == content::JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
+    GtkWidget* content_area =
+        gtk_dialog_get_content_area(GTK_DIALOG(gtk_dialog_));
+    GtkWidget* text_box = gtk_entry_new();
+    gtk_entry_set_text(GTK_ENTRY(text_box),
+                       UTF16ToUTF8(default_prompt_text).c_str());
+    gtk_box_pack_start(GTK_BOX(content_area), text_box, TRUE, TRUE, 0);
+    g_object_set_data(G_OBJECT(gtk_dialog_), kPromptTextId, text_box);
+    gtk_entry_set_activates_default(GTK_ENTRY(text_box), TRUE);
+  }
+
+  gtk_dialog_set_default_response(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_OK);
+  g_signal_connect(gtk_dialog_, "response", G_CALLBACK(OnResponseThunk), this);
+  gtk_widget_show_all(GTK_WIDGET(gtk_dialog_));
+}
+
+CefJavaScriptDialog::~CefJavaScriptDialog() {
+}
+
+void CefJavaScriptDialog::Cancel() {
+}
+
+void CefJavaScriptDialog::OnResponse(GtkWidget* dialog, int response_id) {
+  switch (response_id) {
+    case GTK_RESPONSE_OK:
+      callback_.Run(true, GetPromptText(GTK_DIALOG(dialog)));
+      break;
+    case GTK_RESPONSE_CANCEL:
+    case GTK_RESPONSE_DELETE_EVENT:
+      callback_.Run(false, string16());
+      break;
+    default:
+      NOTREACHED();
+  }
+
+  gtk_widget_destroy(dialog);
+
+  creator_->DialogClosed(this);
+}