Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Unified Diff: chrome/browser/gtk/options/content_page_gtk.cc

Issue 1969006: Fix 18949 on GTK ("Options" window does not fit a small display). (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: Update based on evan's comments of patch set 4 and sync with trunk Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/gtk/options/content_page_gtk.cc
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 62ebcfdc5bef5854eaf2cf08c051d7f1361996d6..4ae6ee17a470bf4d4f710dab3d0930ee21dfeb74 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -87,27 +87,28 @@ ContentPageGtk::ContentPageGtk(Profile* profile)
}
// Prepare the group options layout.
- OptionsLayoutBuilderGtk options_builder;
+ scoped_ptr<OptionsLayoutBuilderGtk>
+ options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout());
if (sync_service_) {
- options_builder.AddOptionGroup(
+ options_builder->AddOptionGroup(
l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_GROUP_NAME),
InitSyncGroup(), false);
UpdateSyncControls();
}
- options_builder.AddOptionGroup(
+ options_builder->AddOptionGroup(
l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_GROUP_NAME),
InitPasswordSavingGroup(), false);
- options_builder.AddOptionGroup(
+ options_builder->AddOptionGroup(
l10n_util::GetStringUTF8(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME),
InitFormAutoFillGroup(), false);
- options_builder.AddOptionGroup(
+ options_builder->AddOptionGroup(
l10n_util::GetStringUTF8(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME),
InitBrowsingDataGroup(), false);
- options_builder.AddOptionGroup(
+ options_builder->AddOptionGroup(
l10n_util::GetStringUTF8(IDS_APPEARANCE_GROUP_NAME),
InitThemesGroup(), false);
- page_ = options_builder.get_page_widget();
+ page_ = options_builder->get_page_widget();
// Add preferences observers.
ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
« no previous file with comments | « chrome/browser/gtk/options/content_filter_page_gtk.cc ('k') | chrome/browser/gtk/options/cookie_filter_page_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698