diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 23:43:38 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 23:43:38 +0000 |
| commit | 28f964305c178006b7b73792b5f62ce16da24f10 (patch) | |
| tree | d56aa88955f1cd3d2d0c0e2a98d3374126fd5965 /chrome/browser/gtk | |
| parent | 07575a271a08b1e5ddf8ed9341a523dba482579c (diff) | |
| download | chromium_src-28f964305c178006b7b73792b5f62ce16da24f10.zip chromium_src-28f964305c178006b7b73792b5f62ce16da24f10.tar.gz chromium_src-28f964305c178006b7b73792b5f62ce16da24f10.tar.bz2 | |
Revert 52870 - Revert 52740 - Always show the 'Control sync from Google Dashboard' link on the sync options dialog.
BUG=48844
TEST=open Personal Stuff on any platform, see dashboard link.
Review URL: http://codereview.chromium.org/2827055
TBR=tim@chromium.org
Review URL: http://codereview.chromium.org/2881021
TBR=tim@chromium.org
Review URL: http://codereview.chromium.org/3364012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.cc | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index 13b2cea..c72a530 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -374,25 +374,22 @@ GtkWidget* ContentPageGtk::InitSyncGroup() { gtk_box_pack_start(GTK_BOX(button_hbox), sync_customize_button_, FALSE, FALSE, 0); - // Add the privacy dashboard link. Only show it if the command line - // switch has been provided. - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kShowPrivacyDashboardLink)) { - GtkWidget* dashboard_link_hbox = - gtk_hbox_new(FALSE, gtk_util::kLabelSpacing); - GtkWidget* dashboard_link_background = gtk_event_box_new(); - std::string dashboard_link_label = - l10n_util::GetStringUTF8(IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL); - privacy_dashboard_link_ = - gtk_chrome_link_button_new(dashboard_link_label.c_str()); - g_signal_connect(privacy_dashboard_link_, "clicked", - G_CALLBACK(OnPrivacyDashboardLinkClickedThunk), this); - gtk_box_pack_start(GTK_BOX(vbox), dashboard_link_hbox, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(dashboard_link_hbox), - dashboard_link_background, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(dashboard_link_background), - privacy_dashboard_link_); - } + // Add the privacy dashboard link. + GtkWidget* dashboard_link_hbox = + gtk_hbox_new(FALSE, gtk_util::kLabelSpacing); + GtkWidget* dashboard_link_background = gtk_event_box_new(); + std::string dashboard_link_label = + l10n_util::GetStringUTF8(IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL); + privacy_dashboard_link_ = + gtk_chrome_link_button_new(dashboard_link_label.c_str()); + g_signal_connect(privacy_dashboard_link_, "clicked", + G_CALLBACK(OnPrivacyDashboardLinkClickedThunk), this); + gtk_box_pack_start(GTK_BOX(vbox), dashboard_link_hbox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(dashboard_link_hbox), + dashboard_link_background, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(dashboard_link_background), + privacy_dashboard_link_); + return vbox; } |