Gtk: Change content settings window to use a list instead of tabs.

chrome/browser/gtk/options/content_filter_page_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/options/content_filter_page_gtk.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/content_exceptions_window_gtk.h"
 #include "chrome/browser/gtk/options/simple_content_exceptions_window.h"
-#include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification_exceptions_table_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 ContentFilterPageGtk::ContentFilterPageGtk(Profile* profile,
                                            ContentSettingsType content_type)
     : OptionsPageBase(profile),
       content_type_(content_type),
       ask_radio_(NULL) {
   static const int kTitleIDs[] = {
     0,  // This dialog isn't used for cookies.
     IDS_IMAGES_SETTING_LABEL,
     IDS_JS_SETTING_LABEL,
     IDS_PLUGIN_SETTING_LABEL,
     IDS_POPUP_SETTING_LABEL,
     IDS_GEOLOCATION_SETTING_LABEL,
     IDS_NOTIFICATIONS_SETTING_LABEL,
   };
   COMPILE_ASSERT(arraysize(kTitleIDs) == CONTENT_SETTINGS_NUM_TYPES,
                  kTitleIDs_IncorrectSize);
 
-  scoped_ptr<OptionsLayoutBuilderGtk>
-    options_builder(OptionsLayoutBuilderGtk::Create());
-  options_builder->AddOptionGroup(
-      l10n_util::GetStringUTF8(kTitleIDs[content_type_]),
-      InitGroup(), true);
-  page_ = options_builder->get_page_widget();
+  GtkWidget* title_label = gtk_util::CreateBoldLabel(
+      l10n_util::GetStringUTF8(kTitleIDs[content_type_]));
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+  gtk_box_pack_start(GTK_BOX(page_), title_label, FALSE, FALSE, 0);
+  gtk_container_add(GTK_CONTAINER(page_), InitGroup());
 }
 
 ContentFilterPageGtk::~ContentFilterPageGtk() {
 }
 
 
 GtkWidget* ContentFilterPageGtk::InitGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   static const int kAllowIDs[] = {
@@ skipping 154 matching lines @@
 }
 
 void ContentFilterPageGtk::OnPluginsPageLinkClicked(GtkWidget* button) {
   // We open a new browser window so the Options dialog doesn't get lost
   // behind other windows.
   Browser* browser = Browser::Create(profile());
   browser->OpenURL(GURL(chrome::kChromeUIPluginsURL),
                    GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   browser->window()->Show();
 }