From 3a91eff218570a1d5c322262c96fbb0a41e3b580 Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Wed, 17 Mar 2010 00:16:02 +0000 Subject: Spruced up the warning dialog for when you enable an extension in incognito. I hijacked the extension install/uninstall dialog, and added another type that it can transmogrify into. BUG=32365 Review URL: http://codereview.chromium.org/1041002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41787 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/extension_install_prompt_gtk.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'chrome/browser/gtk') diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc index ef93811..ff5dc1a 100644 --- a/chrome/browser/gtk/extension_install_prompt_gtk.cc +++ b/chrome/browser/gtk/extension_install_prompt_gtk.cc @@ -52,12 +52,10 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon, Extension *extension, ExtensionInstallUI::Delegate *delegate, const string16& warning_text, - bool is_uninstall) { + ExtensionInstallUI::PromptType type) { // Build the dialog. - int title_id = is_uninstall ? IDS_EXTENSION_UNINSTALL_PROMPT_TITLE : - IDS_EXTENSION_INSTALL_PROMPT_TITLE; - int button_id = is_uninstall ? IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON : - IDS_EXTENSION_PROMPT_INSTALL_BUTTON; + int title_id = ExtensionInstallUI::kTitleIds[type]; + int button_id = ExtensionInstallUI::kButtonIds[type]; GtkWidget* dialog = gtk_dialog_new_with_buttons( l10n_util::GetStringUTF8(title_id).c_str(), parent, @@ -85,8 +83,7 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon, GtkWidget* right_column_area = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0); - int heading_id = is_uninstall ? IDS_EXTENSION_UNINSTALL_PROMPT_HEADING : - IDS_EXTENSION_INSTALL_PROMPT_HEADING; + int heading_id = ExtensionInstallUI::kHeadingIds[type]; std::string heading_text = WideToUTF8(l10n_util::GetStringF( heading_id, UTF8ToWide(extension->name()))); GtkWidget* heading_label = MakeMarkupLabel("%s", @@ -111,7 +108,7 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon, void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( Profile* profile, Delegate* delegate, Extension* extension, SkBitmap* icon, - const string16& warning_text, bool is_uninstall) { + const string16& warning_text, ExtensionInstallUI::PromptType type) { Browser* browser = BrowserList::GetLastActiveWithProfile(profile); if (!browser) { delegate->InstallUIAbort(); @@ -126,5 +123,5 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( } ShowInstallPromptDialog(browser_window->window(), icon, extension, - delegate, warning_text, is_uninstall); + delegate, warning_text, type); } -- cgit v1.1