Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1043)

Unified Diff: chrome/browser/views/js_modal_dialog_views.cc

Issue 3538012: Use BubbleWindow for ChromeOS windows/dialogs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix win trybot Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/html_dialog_view.cc ('k') | chrome/browser/views/modal_dialog_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/js_modal_dialog_views.cc
diff --git a/chrome/browser/views/js_modal_dialog_views.cc b/chrome/browser/views/js_modal_dialog_views.cc
index b8ee8ccbc9d33c34839af0a332c594f5e5888ba8..a60f943a6b37494a48d2ae622053d88ac01ee2bd 100644
--- a/chrome/browser/views/js_modal_dialog_views.cc
+++ b/chrome/browser/views/js_modal_dialog_views.cc
@@ -8,14 +8,11 @@
#include "app/l10n_util.h"
#include "app/message_box_flags.h"
#include "chrome/browser/app_modal_dialog.h"
+#include "chrome/browser/views/window.h"
#include "grit/generated_resources.h"
#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:
@@ -153,12 +150,6 @@ NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
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
-
+ browser::CreateViewsWindow(parent_window, gfx::Rect(), d);
return d;
}
« no previous file with comments | « chrome/browser/views/html_dialog_view.cc ('k') | chrome/browser/views/modal_dialog_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698