summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-18 22:02:33 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-18 22:02:33 +0000
commit4d55941c9ffb76a6a9d625bdefc97f112b68fc1c (patch)
tree50539726f1788dfc53cc293a38cca76c2ad074b1 /chrome/browser/gtk
parent0e24f381dc05398248c8920d8eab52785a26b9ba (diff)
downloadchromium_src-4d55941c9ffb76a6a9d625bdefc97f112b68fc1c.zip
chromium_src-4d55941c9ffb76a6a9d625bdefc97f112b68fc1c.tar.gz
chromium_src-4d55941c9ffb76a6a9d625bdefc97f112b68fc1c.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc35
1 files changed, 19 insertions, 16 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index cf0a4ed..1532e2c 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -371,22 +371,25 @@ GtkWidget* ContentPageGtk::InitSyncGroup() {
gtk_box_pack_start(GTK_BOX(button_hbox), sync_customize_button_, FALSE,
FALSE, 0);
- // 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_);
-
+ // 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_);
+ }
return vbox;
}