summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 21:46:02 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 21:46:02 +0000
commitaf03ffa2e41ce53568634ec0dba705c8251af1f3 (patch)
treefdde7c36fa5736fe5db3aa909de91b3bc6cef778
parent93623c5d8fd1847dc31b67ed15779a3267a78d97 (diff)
downloadchromium_src-af03ffa2e41ce53568634ec0dba705c8251af1f3.zip
chromium_src-af03ffa2e41ce53568634ec0dba705c8251af1f3.tar.gz
chromium_src-af03ffa2e41ce53568634ec0dba705c8251af1f3.tar.bz2
Fix sync options to properly hide the link when the dialog is first shown.
BUG=29762 TEST=Open the options dialog. Note that there is no invisible rectangle. Review URL: http://codereview.chromium.org/492006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34286 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index b4d67ba..9db5cbd 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -333,6 +333,8 @@ GtkWidget* ContentPageGtk::InitSyncGroup() {
FALSE, 0);
gtk_container_add(GTK_CONTAINER(sync_action_link_background_),
sync_action_link_);
+ gtk_widget_set_no_show_all(sync_action_link_background_, TRUE);
+ gtk_widget_hide(sync_action_link_background_);
// Add the sync button into its own horizontal box so it does not
// depend on the spacing above.
@@ -372,9 +374,9 @@ void ContentPageGtk::UpdateSyncControls() {
gtk_chrome_link_button_set_label(GTK_CHROME_LINK_BUTTON(sync_action_link_),
UTF16ToUTF8(link_label).c_str());
if (link_label.empty()) {
- gtk_widget_hide(sync_action_link_);
+ gtk_widget_hide(sync_action_link_background_);
} else {
- gtk_widget_show(sync_action_link_);
+ gtk_widget_show(sync_action_link_background_);
}
if (status_has_error) {
gtk_widget_modify_bg(sync_status_label_background_, GTK_STATE_NORMAL,