Revert 62635 - removed dashboard link from options ui, clear no longer behind switch

BUG=59095
TEST=See ui in options tab and clear other data tab

Review URL: http://codereview.chromium.org/3758004

TBR=raz@chromium.org
Review URL: http://codereview.chromium.org/3811008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62779 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 0 deletions

diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 3e33805..8aff196 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -78,6 +78,7 @@ ContentPageGtk::ContentPageGtk(Profile* profile)
 #endif
       sync_start_stop_button_(NULL),
       sync_customize_button_(NULL),
+      privacy_dashboard_link_(NULL),
       initializing_(true),
       sync_service_(NULL),
       managed_prefs_banner_(profile->GetPrefs(), OPTIONS_PAGE_CONTENT) {
@@ -372,6 +373,23 @@ 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_);
+
+
   return vbox;
 }
 
@@ -598,3 +616,6 @@ void ContentPageGtk::OnStopSyncDialogResponse(GtkWidget* widget, int response) {
   gtk_widget_destroy(widget);
 }
 
+void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) {
+  BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
+}
diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h
index 43878c6..286e28c 100644
--- a/chrome/browser/gtk/options/content_page_gtk.h
+++ b/chrome/browser/gtk/options/content_page_gtk.h
@@ -63,6 +63,7 @@ class ContentPageGtk : public OptionsPageBase,
   CHROMEGTK_CALLBACK_0(ContentPageGtk, void, OnSyncCustomizeButtonClicked);
   CHROMEGTK_CALLBACK_0(ContentPageGtk, void, OnSyncActionLinkClicked);
   CHROMEGTK_CALLBACK_1(ContentPageGtk, void, OnStopSyncDialogResponse, int);
+  CHROMEGTK_CALLBACK_0(ContentPageGtk, void, OnPrivacyDashboardLinkClicked);
 
   // Widgets for the Password saving group.
   GtkWidget* passwords_asktosave_radio_;
@@ -87,6 +88,7 @@ class ContentPageGtk : public OptionsPageBase,
   GtkWidget* sync_action_link_;
   GtkWidget* sync_start_stop_button_;
   GtkWidget* sync_customize_button_;
+  GtkWidget* privacy_dashboard_link_;
 
   // The parent GtkTable widget
   GtkWidget* page_;