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

2 files changed, 1 insertions, 11 deletions

diff --git a/chrome/browser/views/options/content_settings_window_view.cc b/chrome/browser/views/options/content_settings_window_view.cc
index 060e4c9..fb58d7c 100644
--- a/chrome/browser/views/options/content_settings_window_view.cc
+++ b/chrome/browser/views/options/content_settings_window_view.cc
@@ -45,15 +45,7 @@ void ShowContentSettingsWindow(gfx::NativeWindow parent_window,
   instance_->ShowContentSettingsTab(content_type);
 }
 
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ContentSettingsWindowView, public:
-
-// static
-void ContentSettingsWindowView::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterIntegerPref(prefs::kContentSettingsWindowLastTabIndex, 0);
-}
+}  // namespace browser
 
 ContentSettingsWindowView::ContentSettingsWindowView(Profile* profile)
     // Always show preferences for the original profile. Most state when off
diff --git a/chrome/browser/views/options/content_settings_window_view.h b/chrome/browser/views/options/content_settings_window_view.h
index 634416d..c4ce14f 100644
--- a/chrome/browser/views/options/content_settings_window_view.h
+++ b/chrome/browser/views/options/content_settings_window_view.h
@@ -24,8 +24,6 @@ class ContentSettingsWindowView : public views::View,
                                   public views::DialogDelegate,
                                   public views::TabbedPane::Listener {
  public:
-  static void RegisterUserPrefs(PrefService* prefs);
-
   explicit ContentSettingsWindowView(Profile* profile);
   virtual ~ContentSettingsWindowView();