chrome/browser/gtk/options/general_page_gtk.cc - Issue 1969006: Fix 18949 on GTK ("Options" window does not fit a small display).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/gtk/options/general_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:

Index: chrome/browser/gtk/options/general_page_gtk.cc

diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc

index 391923278ab49f68b40c8450491e515c39d47574..d36fbacf47befd824671d299bbdde25b7a187277 100644

--- a/chrome/browser/gtk/options/general_page_gtk.cc

+++ b/chrome/browser/gtk/options/general_page_gtk.cc

@@ -75,22 +75,23 @@ GeneralPageGtk::GeneralPageGtk(Profile* profile)

new ShellIntegration::DefaultBrowserWorker(this)),

managed_prefs_banner_(profile->GetPrefs(), kGeneralManagablePrefs,

arraysize(kGeneralManagablePrefs)) {

- OptionsLayoutBuilderGtk options_builder;

- page_ = options_builder.get_page_widget();

+ scoped_ptr<OptionsLayoutBuilderGtk>

+ options_builder(OptionsLayoutBuilderGtk::CreateOptionallyCompactLayout());

+ page_ = options_builder->get_page_widget();

accessible_widget_helper_.reset(new AccessibleWidgetHelper(page_, profile));

- options_builder.AddWidget(managed_prefs_banner_.banner_widget(), false);

- options_builder.AddOptionGroup(

+ options_builder->AddWidget(managed_prefs_banner_.banner_widget(), false);

+ options_builder->AddOptionGroup(

l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_GROUP_NAME),

InitStartupGroup(), true);

- options_builder.AddOptionGroup(

+ options_builder->AddOptionGroup(

l10n_util::GetStringUTF8(IDS_OPTIONS_HOMEPAGE_GROUP_NAME),

InitHomepageGroup(), false);

- options_builder.AddOptionGroup(

+ options_builder->AddOptionGroup(

l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),

InitDefaultSearchGroup(), false);

#if !defined(OS_CHROMEOS)

- options_builder.AddOptionGroup(

+ options_builder->AddOptionGroup(

l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME),

InitDefaultBrowserGroup(), false);

#endif