diff options
Diffstat (limited to 'chrome/browser/ui/views')
6 files changed, 15 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc index 1d351c0..8ec8681 100644 --- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc @@ -131,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(HtmlDialogBrowserTest, MAYBE_SizeWindow) { new HtmlDialogView(browser()->profile(), delegate); TabContents* tab_contents = browser()->GetSelectedTabContents(); ASSERT_TRUE(tab_contents != NULL); - views::Window::CreateChromeWindow(tab_contents->GetMessageBoxRootWindow(), + views::Window::CreateChromeWindow(tab_contents->GetDialogRootWindow(), gfx::Rect(), html_view); html_view->InitDialog(); html_view->window()->Show(); diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index 6bccb5d..4f3f472 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -23,7 +23,8 @@ JSModalDialogViews::JSModalDialogViews( : parent_(parent), message_box_view_(new views::MessageBoxView( parent->dialog_flags() | ui::MessageBoxFlags::kAutoDetectAlignment, - parent->message_text(), parent->default_prompt_text())) { + UTF16ToWideHack(parent->message_text()), + UTF16ToWideHack(parent->default_prompt_text()))) { DCHECK(message_box_view_); message_box_view_->AddAccelerator( @@ -90,7 +91,7 @@ int JSModalDialogViews::GetDialogButtons() const { } std::wstring JSModalDialogViews::GetWindowTitle() const { - return parent_->title(); + return UTF16ToWideHack(parent_->title()); } @@ -108,7 +109,7 @@ bool JSModalDialogViews::Cancel() { } bool JSModalDialogViews::Accept() { - parent_->OnAccept(message_box_view_->GetInputText(), + parent_->OnAccept(WideToUTF16Hack(message_box_view_->GetInputText()), message_box_view_->IsCheckBoxSelected()); return true; } diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc index e738d6c..bee7774 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc @@ -46,7 +46,7 @@ void ShowSSLClientCertificateSelector( IDS_CLIENT_CERT_DIALOG_TEXT, ASCIIToUTF16(cert_request_info->host_and_port))); PCCERT_CONTEXT cert_context = CryptUIDlgSelectCertificateFromStore( - client_certs, parent->GetMessageBoxRootWindow(), + client_certs, parent->GetDialogRootWindow(), title.c_str(), text.c_str(), 0, 0, NULL); net::X509Certificate* cert = NULL; diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc index 2840a8b..dd8fe8c 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 2ffa620..88c5086 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -11,6 +11,7 @@ #include "base/i18n/rtl.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/tabs/base_tab.h" @@ -488,6 +489,11 @@ bool DraggedTabController::ShouldSuppressDialogs() { return false; } +content::JavaScriptDialogCreator* +DraggedTabController::GetJavaScriptDialogCreator() { + return GetJavaScriptDialogCreatorInstance(); +} + /////////////////////////////////////////////////////////////////////////////// // DraggedTabController, NotificationObserver implementation: diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.h b/chrome/browser/ui/views/tabs/dragged_tab_controller.h index 55289b1..9023a2b 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.h +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.h @@ -148,6 +148,8 @@ class DraggedTabController : public TabContentsDelegate, const gfx::Rect& pos) OVERRIDE; virtual void UpdateTargetURL(TabContents* source, const GURL& url) OVERRIDE; virtual bool ShouldSuppressDialogs() OVERRIDE; + virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator() + OVERRIDE; // Overridden from NotificationObserver: virtual void Observe(NotificationType type, |