gtk: fix 18949 on GTK ("Options" window does not fit a small display).

Change the layout of content and general page. Use the horizontal title and content layout for each option group.

BUG=18949
TEST=Open the option window, check the content and general pages.

Patch by Ningxin Hu <ningxin.hu@intel.com>.

Review URL: http://codereview.chromium.org/1969006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49291 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 8 deletions

diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index b1257d6..5ed339d 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -1193,37 +1193,38 @@ AdvancedContentsGtk::~AdvancedContentsGtk() {
 }
 
 void AdvancedContentsGtk::Init() {
-  OptionsLayoutBuilderGtk options_builder;
+  scoped_ptr<OptionsLayoutBuilderGtk>
+    options_builder(OptionsLayoutBuilderGtk::Create());
 
   privacy_section_.reset(new PrivacySection(profile_));
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY),
       privacy_section_->get_page_widget(), false);
 
   network_section_.reset(new NetworkSection(profile_));
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK),
       network_section_->get_page_widget(), false);
 
   translate_section_.reset(new TranslateSection(profile_));
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE),
       translate_section_->get_page_widget(), false);
 
   download_section_.reset(new DownloadSection(profile_));
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME),
       download_section_->get_page_widget(), false);
 
   web_content_section_.reset(new WebContentSection(profile_));
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
       web_content_section_->get_page_widget(), false);
 
   security_section_.reset(new SecuritySection(profile_));
-  options_builder.AddOptionGroup(
+  options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
       security_section_->get_page_widget(), false);
 
-  page_ = options_builder.get_page_widget();
+  page_ = options_builder->get_page_widget();
 }