diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 16:56:57 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 16:56:57 +0000 |
| commit | 2584175b3e3eca657e6070dc82879469402f0ca2 (patch) | |
| tree | a828ba3c86d3f61a94bf7da62ed685d76b058e8f /chrome/browser/views | |
| parent | becc4d956b84df3962aa7986bf7d2fb0ddd81e52 (diff) | |
| download | chromium_src-2584175b3e3eca657e6070dc82879469402f0ca2.zip chromium_src-2584175b3e3eca657e6070dc82879469402f0ca2.tar.gz chromium_src-2584175b3e3eca657e6070dc82879469402f0ca2.tar.bz2 | |
Use BubbleWindow for JSModalDialogViews on ChromeOS.
Also make BubbleWindow title left aligned per mock and fix wrong
background color for DialogClientView by setting bg color to widget style.
BUG=chromeium-os:6305
TEST=Verify js dialog on chrome os is in new bubble look again.
Review URL: http://codereview.chromium.org/3598008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/js_modal_dialog_views.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/views/js_modal_dialog_views.cc b/chrome/browser/views/js_modal_dialog_views.cc index d9a0a7b..b8ee8cc 100644 --- a/chrome/browser/views/js_modal_dialog_views.cc +++ b/chrome/browser/views/js_modal_dialog_views.cc @@ -12,6 +12,10 @@ #include "views/controls/message_box_view.h" #include "views/window/window.h" +#if defined(OS_CHROMEOS) +#include "chrome/browser/chromeos/frame/bubble_window.h" +#endif // defined(OS_CHROMEOS) + //////////////////////////////////////////////////////////////////////////////// // JSModalDialogViews, public: @@ -148,6 +152,13 @@ NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt( JavaScriptAppModalDialog* dialog, gfx::NativeWindow parent_window) { JSModalDialogViews* d = new JSModalDialogViews(dialog); + +#if defined(OS_CHROMEOS) + // Use bubble frame for JS dialog on ChromeOS. + chromeos::BubbleWindow::Create(parent_window, gfx::Rect(), d); +#else views::Window::CreateChromeWindow(parent_window, gfx::Rect(), d); +#endif + return d; } |