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/browser_window_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/browser_window_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index c370b66..7dc5431 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -59,6 +59,7 @@ #include "chrome/browser/gtk/infobar_container_gtk.h" #include "chrome/browser/gtk/keyword_editor_view.h" #include "chrome/browser/gtk/nine_box.h" +#include "chrome/browser/gtk/options/content_settings_window_gtk.h" #include "chrome/browser/gtk/repost_form_warning_gtk.h" #include "chrome/browser/gtk/status_bubble_gtk.h" #include "chrome/browser/gtk/tab_contents_container_gtk.h" @@ -874,7 +875,7 @@ void BrowserWindowGtk::ShowRepostFormWarningDialog( void BrowserWindowGtk::ShowContentSettingsWindow( ContentSettingsType content_type, Profile* profile) { - NOTIMPLEMENTED(); + ContentSettingsWindowGtk::Show(GetNativeHandle(), content_type, profile); } void BrowserWindowGtk::ShowProfileErrorDialog(int message_id) { |