diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:58:54 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:58:54 +0000 |
| commit | d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95 (patch) | |
| tree | 8912ce2d6acc77fda0119d872283268390eeef15 /chrome/browser/gtk/content_blocked_bubble_gtk.cc | |
| parent | 13044cdc2b1e8fb304af65a7913c083f52c623bc (diff) | |
| download | chromium_src-d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95.zip chromium_src-d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95.tar.gz chromium_src-d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95.tar.bz2 | |
GTK: Implements the content settings window and the minor changes to the options dialog.
The "Exceptions" dialogs are still not implemented; they're the next step but
this changelist is already getting pretty huge.
BUG=35178
TEST=none
Review URL: http://codereview.chromium.org/602005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/content_blocked_bubble_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/content_blocked_bubble_gtk.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/gtk/content_blocked_bubble_gtk.cc b/chrome/browser/gtk/content_blocked_bubble_gtk.cc index 6f81658..2399281 100644 --- a/chrome/browser/gtk/content_blocked_bubble_gtk.cc +++ b/chrome/browser/gtk/content_blocked_bubble_gtk.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "chrome/browser/blocked_popup_container.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" +#include "chrome/browser/gtk/options/content_settings_window_gtk.h" #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -224,6 +225,13 @@ void ContentBlockedBubbleGtk::OnCloseButtonClicked( void ContentBlockedBubbleGtk::OnManageLinkClicked( GtkButton* button, ContentBlockedBubbleGtk* bubble) { - // TODO(erg): Attach this to the options page once that's been written. - NOTIMPLEMENTED(); + if (bubble->tab_contents_) { + bubble->tab_contents_->delegate()->ShowContentSettingsWindow( + bubble->content_type_); + } else { + ContentSettingsWindowGtk::Show(NULL, bubble->content_type_, + bubble->profile_); + } + + bubble->Close(); } |