Use BubbleWindow for ChromeOS windows/dialogs.

BUG=chromium-os:7216
TEST=Verify all windows/dialogs use new bubble design, e.g. JS dialog, page info window, certificate view, extension install confirmation, save as dialog etc.

Review URL: http://codereview.chromium.org/3538012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61885 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 71 insertions, 19 deletions

diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 03f96206..160cbf4 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/views/accessible_view_helper.h"
+#include "chrome/browser/views/window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
@@ -81,7 +82,7 @@ namespace browser {
   views::Window* ShowAboutChromeView(gfx::NativeWindow parent,
                                      Profile* profile) {
       views::Window* about_chrome_window =
-        views::Window::CreateChromeWindow(parent,
+        browser::CreateViewsWindow(parent,
         gfx::Rect(),
         new AboutChromeView(profile));
       about_chrome_window->Show();
diff --git a/chrome/browser/views/extensions/extension_install_prompt2.cc b/chrome/browser/views/extensions/extension_install_prompt2.cc
index 5b0ed3a..467ae20 100644
--- a/chrome/browser/views/extensions/extension_install_prompt2.cc
+++ b/chrome/browser/views/extensions/extension_install_prompt2.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/browser/views/window.h"
 #include "grit/generated_resources.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
@@ -312,7 +313,7 @@ void ExtensionInstallUI::ShowExtensionInstallUIPrompt2Impl(
     return;
   }
 
-  views::Window::CreateChromeWindow(window->GetNativeHandle(), gfx::Rect(),
+  browser::CreateViewsWindow(window->GetNativeHandle(), gfx::Rect(),
       new InstallDialogContent2(delegate, extension, icon, permissions))
           ->Show();
 }
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 4cd42ba..a459999 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -53,6 +53,7 @@
 #include "chrome/browser/views/theme_install_bubble_view.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/browser/views/update_recommended_message_box.h"
+#include "chrome/browser/views/window.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/chrome_switches.h"
@@ -1163,8 +1164,8 @@ void BrowserView::ShowThemeInstallBubble() {
 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() {
   DownloadInProgressConfirmDialogDelegate* delegate =
       new DownloadInProgressConfirmDialogDelegate(browser_.get());
-  views::Window::CreateChromeWindow(GetNativeHandle(), gfx::Rect(),
-                                    delegate)->Show();
+  browser::CreateViewsWindow(GetNativeHandle(), gfx::Rect(),
+                             delegate)->Show();
 }
 
 void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index d2f4c04..7d12d78 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -7,6 +7,7 @@
 #include "app/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/views/window.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
@@ -23,7 +24,7 @@ void ShowHtmlDialogView(gfx::NativeWindow parent, Profile* profile,
                         HtmlDialogUIDelegate* delegate) {
   HtmlDialogView* html_view =
       new HtmlDialogView(profile, delegate);
-  views::Window::CreateChromeWindow(parent, gfx::Rect(), html_view);
+  browser::CreateViewsWindow(parent, gfx::Rect(), html_view);
   html_view->InitDialog();
   html_view->window()->Show();
 }
diff --git a/chrome/browser/views/js_modal_dialog_views.cc b/chrome/browser/views/js_modal_dialog_views.cc
index b8ee8cc..a60f943 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;
 }
diff --git a/chrome/browser/views/modal_dialog_delegate.cc b/chrome/browser/views/modal_dialog_delegate.cc
index a0f91ba..a08d611 100644
--- a/chrome/browser/views/modal_dialog_delegate.cc
+++ b/chrome/browser/views/modal_dialog_delegate.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/views/modal_dialog_delegate.h"
 
 #include "base/logging.h"
+#include "chrome/browser/views/window.h"
 #include "views/window/window.h"
 
 void ModalDialogDelegate::ShowModalDialog() {
@@ -14,7 +15,7 @@ void ModalDialogDelegate::ShowModalDialog() {
   if (!root_hwnd) {
     Cancel();
   } else {
-    dialog_ = views::Window::CreateChromeWindow(root_hwnd, gfx::Rect(), this);
+    dialog_ = browser::CreateViewsWindow(root_hwnd, gfx::Rect(), this);
     dialog_->Show();
   }
 }
diff --git a/chrome/browser/views/page_info_window_view.cc b/chrome/browser/views/page_info_window_view.cc
index 4e6057b..eee48ce 100644
--- a/chrome/browser/views/page_info_window_view.cc
+++ b/chrome/browser/views/page_info_window_view.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
+#include "chrome/browser/views/window.h"
 #include "chrome/common/pref_names.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
@@ -179,7 +180,7 @@ void PageInfoWindowView::Init(gfx::NativeWindow parent) {
     }
   }
 
-  views::Window::CreateChromeWindow(parent, gfx::Rect(), this);
+  browser::CreateViewsWindow(parent, gfx::Rect(), this);
 }
 
 gfx::Size PageInfoWindowView::GetPreferredSize() {
diff --git a/chrome/browser/views/window.cc b/chrome/browser/views/window.cc
new file mode 100644
index 0000000..bd8a304
--- /dev/null
+++ b/chrome/browser/views/window.cc
@@ -0,0 +1,26 @@
+// Copyright (c) 2010 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 "chrome/browser/views/window.h"
+
+#include "gfx/rect.h"
+#include "views/window/window.h"
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/frame/bubble_window.h"
+#endif  // defined(OS_CHROMEOS)
+
+namespace browser {
+
+views::Window* CreateViewsWindow(gfx::NativeWindow parent,
+                                 const gfx::Rect& bounds,
+                                 views::WindowDelegate* delegate) {
+#if defined(OS_CHROMEOS)
+  return chromeos::BubbleWindow::Create(parent, gfx::Rect(), delegate);
+#else
+  return views::Window::CreateChromeWindow(parent, gfx::Rect(), delegate);
+#endif
+}
+
+}  // namespace browser
diff --git a/chrome/browser/views/window.h b/chrome/browser/views/window.h
new file mode 100644
index 0000000..c2f2bb4
--- /dev/null
+++ b/chrome/browser/views/window.h
@@ -0,0 +1,29 @@
+// Copyright (c) 2010 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.
+
+#ifndef CHROME_BROWSER_VIEWS_WINDOW_H_
+#define CHROME_BROWSER_VIEWS_WINDOW_H_
+#pragma once
+
+#include "gfx/native_widget_types.h"
+
+namespace gfx {
+class Rect;
+}
+
+namespace views {
+class Window;
+class WindowDelegate;
+}
+
+namespace browser {
+
+// Create a window for given |delegate| using default frame view.
+views::Window* CreateViewsWindow(gfx::NativeWindow parent,
+                                 const gfx::Rect& bounds,
+                                 views::WindowDelegate* delegate);
+
+}  // namespace browser
+
+#endif  // CHROME_BROWSER_VIEWS_WINDOW_H_