diff options
35 files changed, 101 insertions, 42 deletions
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index 8857040..821e9ef 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -36,6 +36,7 @@ #include "chrome/browser/policy/enterprise_install_attributes.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/pref_names.h" #include "net/base/network_change_notifier.h" @@ -1140,7 +1141,7 @@ void TestingAutomationProvider::CaptureProfilePhoto( this, reply_message)); views::Widget* window = browser::CreateViewsWindow( - browser->window()->GetNativeHandle(), take_photo_dialog); + browser->window()->GetNativeHandle(), take_photo_dialog, STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index ad2dfc7..d597c50 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -9,6 +9,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" @@ -122,5 +123,5 @@ ExternalProtocolDialog::ExternalProtocolDialog(TabContents* tab_contents, // Dialog is top level if we don't have a tab_contents associated with us. parent_window = NULL; } - browser::CreateViewsWindow(parent_window, this)->Show(); + browser::CreateViewsWindow(parent_window, this, STYLE_GENERIC)->Show(); } diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index 16370c2..26cb758 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -19,6 +19,7 @@ #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/dom_view.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_version_info.h" @@ -153,7 +154,7 @@ views::Widget* BackgroundView::CreateWindowContainingView( void BackgroundView::CreateModalPopup(views::WidgetDelegate* view) { views::Widget* window = browser::CreateViewsWindow( - GetNativeWindow(), view); + GetNativeWindow(), view, STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 59eb1dd..1efdcdb 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -30,6 +30,7 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -321,7 +322,7 @@ void ExistingUserController::OnLoginFailure(const LoginFailure& failure) { view->Init(); view->set_delegate(this); views::Widget* window = browser::CreateViewsWindow( - GetNativeWindow(), view); + GetNativeWindow(), view, STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } else { @@ -503,7 +504,9 @@ void ExistingUserController::OnPasswordChangeDetected( // TODO(gspencer): We shouldn't have to erase stateful data when // doing this. See http://crosbug.com/9115 http://crosbug.com/7792 PasswordChangedView* view = new PasswordChangedView(this, false); - views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), view); + views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), + view, + STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc index bb3bd84..68ab0d3 100644 --- a/chrome/browser/chromeos/native_dialog_window.cc +++ b/chrome/browser/chromeos/native_dialog_window.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/frame/bubble_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/views/controls/native/native_view_host.h" @@ -331,7 +332,7 @@ void ShowNativeDialog(gfx::NativeWindow parent, const gfx::Size& min_size) { NativeDialogHost* native_dialog_host = new NativeDialogHost(native_dialog, flags, size, min_size); - browser::CreateViewsWindow(parent, native_dialog_host); + browser::CreateViewsWindow(parent, native_dialog_host, STYLE_GENERIC); native_dialog_host->GetWidget()->Show(); } diff --git a/chrome/browser/chromeos/network_login_observer.cc b/chrome/browser/chromeos/network_login_observer.cc index 8118113..680a6be 100644 --- a/chrome/browser/chromeos/network_login_observer.cc +++ b/chrome/browser/chromeos/network_login_observer.cc @@ -12,6 +12,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -37,7 +38,7 @@ void NetworkLoginObserver::CreateModalPopup(views::WidgetDelegate* view) { } if (browser) { views::Widget* window = browser::CreateViewsWindow( - browser->window()->GetNativeHandle(), view); + browser->window()->GetNativeHandle(), view, STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } else { diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index f7f26ac..57d99ed 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -20,6 +20,7 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" @@ -478,7 +479,7 @@ void NetworkMenuModel::SetMenuModelDelegate(ui::MenuModelDelegate* delegate) { void NetworkMenuModel::ShowNetworkConfigView(NetworkConfigView* view) const { views::Widget* window = browser::CreateViewsWindow( - owner_->delegate()->GetNativeWindow(), view); + owner_->delegate()->GetNativeWindow(), view, STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index 1a90739..7e87d7d 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -21,6 +21,7 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "chrome/common/net/gaia/gaia_constants.h" @@ -82,7 +83,7 @@ CloudPrintSetupFlow* CloudPrintSetupFlow::OpenDialog( if (browser && browser->window()) parent_window = browser->window()->GetNativeHandle(); } - browser::ShowHtmlDialog(parent_window, profile, flow); + browser::ShowHtmlDialog(parent_window, profile, flow, STYLE_GENERIC); return flow; } diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index beb85a1..6b94c24 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -21,6 +21,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/print_messages.h" @@ -630,9 +631,9 @@ void CreateDialogImpl(const FilePath& path_to_file, file_type, modal, delete_on_close); if (modal) { DCHECK(browser); - browser->BrowserShowHtmlDialog(dialog_delegate, NULL); + browser->BrowserShowHtmlDialog(dialog_delegate, NULL, STYLE_GENERIC); } else { - browser::ShowHtmlDialog(NULL, profile, dialog_delegate); + browser::ShowHtmlDialog(NULL, profile, dialog_delegate, STYLE_GENERIC); } } diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 1e5f142b..d09cec9 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -1218,7 +1218,8 @@ void Browser::CloseTabContents(TabContents* contents) { gfx::NativeWindow Browser::BrowserShowHtmlDialog( HtmlDialogUIDelegate* delegate, - gfx::NativeWindow parent_window) { + gfx::NativeWindow parent_window, + DialogStyle style) { #if defined(OS_CHROMEOS) // For Chrome OS, first try to parent the dialog over the current browser -- // it's likely to be maximized onscreen. If it isn't tabbed (e.g. it's a @@ -1233,7 +1234,7 @@ gfx::NativeWindow Browser::BrowserShowHtmlDialog( if (!parent_window) parent_window = window_->GetNativeHandle(); - return browser::ShowHtmlDialog(parent_window, profile_, delegate); + return browser::ShowHtmlDialog(parent_window, profile_, delegate, style); } void Browser::BrowserRenderWidgetShowing() { diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index d0144ac..37456d3 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -34,6 +34,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/fullscreen_controller.h" #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" @@ -457,8 +458,14 @@ class Browser : public TabHandlerDelegate, // pointer to the delegate who knows how to display the dialog (which file // URL and JSON string input to use during initialization). |parent_window| // is the window that should be parent of the dialog, or NULL for the default. + // |style| customizes this HTML dialog decoration and layout (X button, + // throbber, default content padding). Except ChromeOS, other platforms + // only have STYLE_GENERIC now. + // TODO(bshe): Implementing styles not related to window decoration in other + // platforms for consistency if necessary. gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, - gfx::NativeWindow parent_window); + gfx::NativeWindow parent_window, + DialogStyle style); // Called when a popup select is about to be displayed. void BrowserRenderWidgetShowing(); diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h index 1f34438..ca42868 100644 --- a/chrome/browser/ui/browser_dialogs.h +++ b/chrome/browser/ui/browser_dialogs.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ #pragma once +#include "chrome/browser/ui/dialog_style.h" #include "ipc/ipc_message.h" #include "ui/gfx/native_widget_types.h" @@ -35,7 +36,8 @@ void ShowAboutIPCDialog(); // Make sure to use the returned window only when you know it is safe // to do so, i.e. before OnDialogClosed() is called on the delegate. gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile, - HtmlDialogUIDelegate* delegate); + HtmlDialogUIDelegate* delegate, + DialogStyle style); // Creates the ExtensionInstalledBubble and schedules it to be shown once // the extension has loaded. |extension| is the installed extension. |browser| diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm index d328a03..aeb61b5 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm @@ -11,6 +11,7 @@ #import "chrome/browser/ui/browser_dialogs.h" #import "chrome/browser/ui/cocoa/browser_command_executor.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "content/browser/tab_contents/tab_contents.h" @@ -76,8 +77,10 @@ private: namespace browser { -gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile, - HtmlDialogUIDelegate* delegate) { +gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, + Profile* profile, + HtmlDialogUIDelegate* delegate, + DialogStyle style) { // It's not always safe to display an html dialog with an off the record // profile. If the last browser with that profile is closed it will go // away. diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc index ff6945a..cf1e74f 100644 --- a/chrome/browser/ui/gtk/html_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc @@ -21,10 +21,14 @@ namespace browser { gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile, - HtmlDialogUIDelegate* delegate) { + HtmlDialogUIDelegate* delegate, + DialogStyle style) { // It's not always safe to display an html dialog with an off the record // profile. If the last browser with that profile is closed it will go // away. + // Ignore style for now. The style parameter only used in the implementation + // in html_dialog_view.cc file. + // TODO (bshe): Add style parameter to HtmlDialogGtk. DCHECK(!profile->IsOffTheRecord() || delegate->IsDialogModal()); HtmlDialogGtk* html_dialog = new HtmlDialogGtk(profile, delegate, parent); diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index db4b2fb..72b6a33 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -20,6 +20,7 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" @@ -90,7 +91,9 @@ namespace browser { // need to depend on our .h. views::Widget* ShowAboutChromeView(gfx::NativeWindow parent, Profile* profile) { views::Widget* about_chrome_window = - browser::CreateViewsWindow(parent, new AboutChromeView(profile)); + browser::CreateViewsWindow(parent, + new AboutChromeView(profile), + STYLE_GENERIC); about_chrome_window->Show(); return about_chrome_window; } diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index 54b7d2b..5f0cded 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc @@ -9,6 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h" #include "chrome/browser/ui/views/window.h" // CreateViewsWindow #include "chrome/common/chrome_notification_types.h" @@ -36,7 +37,7 @@ views::Widget* CreateWindow(gfx::NativeWindow parent, return chromeos::BubbleWindow::Create(parent, STYLE_FLUSH, delegate); #else - return browser::CreateViewsWindow(parent, delegate); + return browser::CreateViewsWindow(parent, delegate, STYLE_GENERIC); #endif } diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index c9dce08d..ad443c6 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" @@ -330,7 +331,7 @@ void ShowExtensionInstallDialogImpl( delegate, extension, icon, prompt); views::Widget* window = browser::CreateViewsWindow( - browser_window->GetNativeHandle(), dialog); + browser_window->GetNativeHandle(), dialog, STYLE_GENERIC); window->Show(); } diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index 3a6e8fd..48eeaa7 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" @@ -117,7 +118,9 @@ void ExtensionUninstallDialogViews::Show() { } view_ = new ExtensionUninstallDialogDelegateView(this, extension_, &icon_); - browser::CreateViewsWindow(window->GetNativeHandle(), view_)->Show(); + browser::CreateViewsWindow(window->GetNativeHandle(), + view_, + STYLE_GENERIC)->Show(); } void ExtensionUninstallDialogViews::ExtensionUninstallAccepted() { diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 6d82700..fcf1a05 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -44,6 +44,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tabs/tab_menu_model.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" @@ -1140,7 +1141,7 @@ void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { DownloadInProgressDialogView* view = new DownloadInProgressDialogView(browser_.get()); - browser::CreateViewsWindow(GetNativeHandle(), view)->Show(); + browser::CreateViewsWindow(GetNativeHandle(), view, STYLE_GENERIC)->Show(); } void BrowserView::ShowCreateWebAppShortcutsDialog( diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index 5936d04..9e21341 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -31,13 +31,14 @@ namespace browser { // Declared in browser_dialogs.h so that others don't need to depend on our .h. gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, Profile* profile, - HtmlDialogUIDelegate* delegate) { + HtmlDialogUIDelegate* delegate, + DialogStyle style) { // It's not always safe to display an html dialog with an off the record // profile. If the last browser with that profile is closed it will go // away. DCHECK(!profile->IsOffTheRecord() || delegate->IsDialogModal()); HtmlDialogView* html_view = new HtmlDialogView(profile, delegate); - browser::CreateViewsWindow(parent, html_view); + browser::CreateViewsWindow(parent, html_view, style); html_view->InitDialog(); html_view->GetWidget()->Show(); return html_view->GetWidget()->GetNativeWindow(); diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index 827b1e0..ead4644 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -166,6 +167,6 @@ NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt( gfx::NativeWindow parent_window) { JSModalDialogViews* d = new JSModalDialogViews(dialog); - browser::CreateViewsWindow(parent_window, d); + browser::CreateViewsWindow(parent_window, d, STYLE_GENERIC); return d; } diff --git a/chrome/browser/ui/views/simple_message_box_views.cc b/chrome/browser/ui/views/simple_message_box_views.cc index 54d16c8..0705896 100644 --- a/chrome/browser/ui/views/simple_message_box_views.cc +++ b/chrome/browser/ui/views/simple_message_box_views.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/simple_message_box.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -143,7 +144,7 @@ SimpleMessageBoxViews::SimpleMessageBoxViews(gfx::NativeWindow parent_window, message_box_view_ = new views::MessageBoxView(dialog_flags, message, string16()); - browser::CreateViewsWindow(parent_window, this)->Show(); + browser::CreateViewsWindow(parent_window, this, STYLE_GENERIC)->Show(); // Add reference to be released in DeleteDelegate(). AddRef(); diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index b440c12..ee86b12 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -103,7 +104,7 @@ UpdateRecommendedMessageBox::UpdateRecommendedMessageBox( l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name), string16(), kDialogWidth); - browser::CreateViewsWindow(parent_window, this)->Show(); + browser::CreateViewsWindow(parent_window, this, STYLE_GENERIC)->Show(); } UpdateRecommendedMessageBox::~UpdateRecommendedMessageBox() { diff --git a/chrome/browser/ui/views/window.cc b/chrome/browser/ui/views/window.cc index 1701d0e..49e6cc7 100644 --- a/chrome/browser/ui/views/window.cc +++ b/chrome/browser/ui/views/window.cc @@ -16,12 +16,12 @@ namespace browser { views::Widget* CreateViewsWindow(gfx::NativeWindow parent, - views::WidgetDelegate* delegate) { + views::WidgetDelegate* delegate, + DialogStyle style) { #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) // TODO(msw): revert to BubbleWindow for all ChromeOS cases when CL // for crbug.com/98322 is landed. - return chromeos::BubbleWindow::Create(parent, - STYLE_GENERIC, delegate); + return chromeos::BubbleWindow::Create(parent, style, delegate); #else return views::Widget::CreateWindowWithParent(delegate, parent); #endif diff --git a/chrome/browser/ui/views/window.h b/chrome/browser/ui/views/window.h index 4b4709a..da9496c 100644 --- a/chrome/browser/ui/views/window.h +++ b/chrome/browser/ui/views/window.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_WINDOW_H_ #pragma once +#include "chrome/browser/ui/dialog_style.h" #include "ui/gfx/native_widget_types.h" namespace views { @@ -18,7 +19,8 @@ namespace browser { // Create a window for given |delegate| using default frame view. views::Widget* CreateViewsWindow(gfx::NativeWindow parent, - views::WidgetDelegate* delegate); + views::WidgetDelegate* delegate, + DialogStyle style); // Create a bubble for a given |delegate|. Takes care of chromeos // specific window type setting if needed. diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index 7ecb9e5..61cfbbc 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc @@ -10,6 +10,7 @@ #include "base/utf_string_conversions.h" #include "base/string_number_conversions.h" #include "chrome/browser/certificate_viewer.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" @@ -87,7 +88,7 @@ void CertificateViewerDialog::Show(gfx::NativeWindow parent) { this, current_wrapper)->window()->GetNativeWindow(); #else - window_ = browser->BrowserShowHtmlDialog(this, parent); + window_ = browser->BrowserShowHtmlDialog(this, parent, STYLE_GENERIC); #endif } diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc index 5f22218..ebea2ae 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc @@ -14,6 +14,7 @@ #include "chrome/browser/chromeos/login/user.h" #include "chrome/browser/chromeos/login/webui_login_display.h" #include "chrome/browser/chromeos/options/take_photo_dialog.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/common/url_constants.h" @@ -186,7 +187,8 @@ void UserImageScreenHandler::HandleTakePhoto(const base::ListValue* args) { TakePhotoDialog* take_photo_dialog = new TakePhotoDialog(this); views::Widget* window = browser::CreateViewsWindow( GetNativeWindow(), - take_photo_dialog); + take_photo_dialog, + STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc index 64a753d..f864c32 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" @@ -72,7 +73,7 @@ void MobileSetupDialogDelegate::ShowDialog() { Browser* browser = BrowserList::GetLastActive(); if (!browser) return; - browser->BrowserShowHtmlDialog(this, NULL); + browser->BrowserShowHtmlDialog(this, NULL, STYLE_GENERIC); } bool MobileSetupDialogDelegate::IsDialogModal() const { diff --git a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc index d9cce3e..1d26652 100644 --- a/chrome/browser/ui/webui/cloud_print_signin_dialog.cc +++ b/chrome/browser/ui/webui/cloud_print_signin_dialog.cc @@ -13,6 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/browser/ui/webui/print_preview_ui.h" #include "chrome/common/pref_names.h" @@ -180,7 +181,9 @@ void CreateCloudPrintSigninDialogImpl(TabContents* parent_tab) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); HtmlDialogUIDelegate* dialog_delegate = new CloudPrintSigninDelegate(parent_tab); - BrowserList::GetLastActive()->BrowserShowHtmlDialog(dialog_delegate, NULL); + BrowserList::GetLastActive()->BrowserShowHtmlDialog(dialog_delegate, + NULL, + STYLE_GENERIC); } void CreateCloudPrintSigninDialog(TabContents* parent_tab) { diff --git a/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc b/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc index 03ea994..7c61a43 100644 --- a/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc +++ b/chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc @@ -15,6 +15,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/url_constants.h" @@ -58,7 +59,7 @@ EditSearchEngineDialogWebUI::EditSearchEngineDialogWebUI( void EditSearchEngineDialogWebUI::ShowDialog() { Browser* browser = BrowserList::GetLastActive(); DCHECK(browser); - browser->BrowserShowHtmlDialog(this, NULL); + browser->BrowserShowHtmlDialog(this, NULL, STYLE_GENERIC); } // HtmlDialogUIDelegate methods diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc index 3a75a70..b6073ad 100644 --- a/chrome/browser/ui/webui/hung_renderer_dialog.cc +++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc @@ -15,6 +15,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/logging_chrome.h" @@ -121,7 +122,7 @@ void HungRendererDialog::ShowDialog(TabContents* contents) { Browser* browser = BrowserList::GetLastActive(); DCHECK(browser); handler_ = new HungRendererDialogHandler(contents_); - window_ = browser->BrowserShowHtmlDialog(this, NULL); + window_ = browser->BrowserShowHtmlDialog(this, NULL, STYLE_GENERIC); contents_observer_.reset(new TabContentsObserverImpl(this, contents_)); } diff --git a/chrome/browser/ui/webui/input_window_dialog_webui.cc b/chrome/browser/ui/webui/input_window_dialog_webui.cc index 0d813d8..ef5f2cb 100644 --- a/chrome/browser/ui/webui/input_window_dialog_webui.cc +++ b/chrome/browser/ui/webui/input_window_dialog_webui.cc @@ -13,6 +13,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" @@ -49,7 +50,7 @@ InputWindowDialogWebUI::~InputWindowDialogWebUI() { void InputWindowDialogWebUI::Show() { Browser* browser = BrowserList::GetLastActive(); DCHECK(browser); - browser->BrowserShowHtmlDialog(this, NULL); + browser->BrowserShowHtmlDialog(this, NULL, STYLE_GENERIC); closed_ = false; } diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index fd0bdeb..c12de31 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/browser/ui/webui/web_ui_util.cc" #include "chrome/common/chrome_notification_types.h" @@ -161,7 +162,8 @@ void ChangePictureOptionsHandler::HandleTakePhoto(const ListValue* args) { DCHECK(args && args->empty()); views::Widget* window = browser::CreateViewsWindow( GetBrowserWindow(), - new TakePhotoDialog(this)); + new TakePhotoDialog(this), + STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index 0d44f40..1174b41 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -38,6 +38,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/views/window.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/common/chrome_notification_types.h" @@ -1076,7 +1077,9 @@ void InternetOptionsHandler::SetActivationButtonVisibility( } void InternetOptionsHandler::CreateModalPopup(views::WidgetDelegate* view) { - views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), view); + views::Widget* window = browser::CreateViewsWindow(GetNativeWindow(), + view, + STYLE_GENERIC); window->SetAlwaysOnTop(true); window->Show(); } diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager_dialog.cc index 4070c3e..9fb52e8 100644 --- a/chrome/browser/ui/webui/task_manager_dialog.cc +++ b/chrome/browser/ui/webui/task_manager_dialog.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/dialog_style.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" #include "grit/google_chrome_strings.h" @@ -135,7 +136,7 @@ void TaskManagerDialogImpl::OnCloseDialog() { void TaskManagerDialogImpl::OpenHtmlDialog() { Browser* browser = BrowserList::GetLastActive(); - window_ = browser->BrowserShowHtmlDialog(this, NULL); + window_ = browser->BrowserShowHtmlDialog(this, NULL, STYLE_GENERIC); } // **************************************************** |