diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 08:22:21 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 08:22:21 +0000 |
| commit | 97c5c596e4b649651fbef56875e125c06acb0f90 (patch) | |
| tree | 3acba85143369eacd72006d383e5e198a59f9c7a /chrome/browser/gtk/content_setting_bubble_gtk.cc | |
| parent | 7a13e7926699ad5d03f2d6e121b7bdb68ca05680 (diff) | |
| download | chromium_src-97c5c596e4b649651fbef56875e125c06acb0f90.zip chromium_src-97c5c596e4b649651fbef56875e125c06acb0f90.tar.gz chromium_src-97c5c596e4b649651fbef56875e125c06acb0f90.tar.bz2 | |
Add "Load all plugins on this page" button to blocked plugins bubble if click-to-play is enabled.
Screenshot: http://imgur.com/ZKsQB.png
XIB changes: Add a rounded rect button hooked up to |loadAllPlugins:| in the File's Owner and referenced by its |loadAllPluginsButton_| outlet, wrapped in a GTMWidthBasedTweaker.
BUG=49677
TEST=ContentSettingBubbleModelTest.*
Review URL: http://codereview.chromium.org/3015036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/content_setting_bubble_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/content_setting_bubble_gtk.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/chrome/browser/gtk/content_setting_bubble_gtk.cc b/chrome/browser/gtk/content_setting_bubble_gtk.cc index f285fd8..d0d4a56 100644 --- a/chrome/browser/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/gtk/content_setting_bubble_gtk.cc @@ -197,6 +197,22 @@ void ContentSettingBubbleGtk::BuildBubble() { FALSE, FALSE, 0); } + if (!content.load_plugins_link_title.empty()) { + GtkWidget* load_plugins_link_box = gtk_hbox_new(FALSE, 0); + GtkWidget* load_plugins_link = gtk_chrome_link_button_new( + content.load_plugins_link_title.c_str()); + gtk_widget_set_sensitive(load_plugins_link, + content.load_plugins_link_enabled); + g_signal_connect(load_plugins_link, "clicked", + G_CALLBACK(OnLoadPluginsLinkClickedThunk), this); + gtk_box_pack_start(GTK_BOX(load_plugins_link_box), load_plugins_link, + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(bubble_content), load_plugins_link_box, + FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(), + FALSE, FALSE, 0); + } + GtkWidget* bottom_box = gtk_hbox_new(FALSE, 0); GtkWidget* manage_link = @@ -281,3 +297,8 @@ void ContentSettingBubbleGtk::OnInfoLinkClicked(GtkWidget* button) { content_setting_bubble_model_->OnInfoLinkClicked(); Close(); } + +void ContentSettingBubbleGtk::OnLoadPluginsLinkClicked(GtkWidget* button) { + content_setting_bubble_model_->OnLoadPluginsLinkClicked(); + Close(); +} |