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

5 files changed, 37 insertions, 9 deletions

diff --git a/chrome/browser/views/clear_browsing_data_view.cc b/chrome/browser/views/clear_browsing_data_view.cc
index d5f16e2..d6f7ab5 100644
--- a/chrome/browser/views/clear_browsing_data_view.cc
+++ b/chrome/browser/views/clear_browsing_data_view.cc
@@ -220,7 +220,6 @@ void ClearBrowsingDataView2::InitControlLayout() {
                   views::GridLayout::CENTER);
 
   layout->AddPaddingRow(0, kUnrelatedControlLargeVerticalSpacing);
-  layout->AddPaddingRow(0, kUnrelatedControlLargeVerticalSpacing);
 
   // Left-align the throbber
   layout->StartRow(0, two_column_set_id);
@@ -229,7 +228,7 @@ void ClearBrowsingDataView2::InitControlLayout() {
 
   // Right-align the clear button
   layout->AddView(clear_browsing_data_button_, 1, 1,
-                  GridLayout::TRAILING, GridLayout::TRAILING);
+                  GridLayout::TRAILING, GridLayout::CENTER);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -287,6 +286,14 @@ void ClearBrowsingDataView2::ButtonPressed(
   UpdateControlEnabledState();
 }
 
+void ClearBrowsingDataView2::LinkActivated(views::Link* source,
+                                          int event_flags) {
+  Browser* browser = Browser::Create(profile_);
+  browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)),
+                   GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+  browser->window()->Show();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView2, private:
 
diff --git a/chrome/browser/views/clear_browsing_data_view.h b/chrome/browser/views/clear_browsing_data_view.h
index 806be23..92133b3 100644
--- a/chrome/browser/views/clear_browsing_data_view.h
+++ b/chrome/browser/views/clear_browsing_data_view.h
@@ -40,7 +40,8 @@ class ClearBrowsingDataView2 : public views::View,
                                public views::ButtonListener,
                                public ComboboxModel,
                                public views::Combobox::Listener,
-                               public BrowsingDataRemover::Observer {
+                               public BrowsingDataRemover::Observer,
+                               public views::LinkController {
  public:
   ClearBrowsingDataView2(Profile* profile, ClearDataView* clear_data_view);
 
@@ -60,6 +61,9 @@ class ClearBrowsingDataView2 : public views::View,
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
+  // Overriden from views::LinkController:
+  virtual void LinkActivated(views::Link* source, int event_flags);
+
   // Enable/disable clearing from this tab
   void SetAllowClear(bool allow);
 
diff --git a/chrome/browser/views/clear_server_data.cc b/chrome/browser/views/clear_server_data.cc
index dc4626c..8252455 100644
--- a/chrome/browser/views/clear_server_data.cc
+++ b/chrome/browser/views/clear_server_data.cc
@@ -10,7 +10,6 @@
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
@@ -168,15 +167,20 @@ void ClearServerDataView::InitControlLayout() {
 }
 
 void ClearServerDataView::InitControlVisibility() {
+  bool allow_clear_server_data_ui =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClearServerData);
+
   // Hide progress indicators
   throbber_->SetVisible(false);
   status_label_->SetVisible(false);
 
-  chrome_sync_title_label_->SetVisible(true);
-  chrome_sync_description_label_->SetVisible(true);
-  clear_server_data_button_->SetVisible(true);
-  dashboard_label_->SetVisible(true);
-  dashboard_link_->SetVisible(true);
+  // Only show the sync portion if behind the flag
+  chrome_sync_title_label_->SetVisible(allow_clear_server_data_ui);
+  chrome_sync_description_label_->SetVisible(allow_clear_server_data_ui);
+  clear_server_data_button_->SetVisible(allow_clear_server_data_ui);
+  dashboard_label_->SetVisible(allow_clear_server_data_ui);
+  dashboard_link_->SetVisible(allow_clear_server_data_ui);
 
   // Enable our clear button, set false for delete_in_progress
   UpdateClearButtonEnabledState(false);
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 774b0fe..541a362 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -71,6 +71,7 @@ ContentPageView::ContentPageView(Profile* profile)
       sync_status_label_(NULL),
       sync_start_stop_button_(NULL),
       sync_customize_button_(NULL),
+      privacy_dashboard_link_(NULL),
       sync_service_(NULL),
       OptionsPageView(profile) {
   if (profile->GetProfileSyncService()) {
@@ -160,6 +161,10 @@ void ContentPageView::LinkActivated(views::Link* source, int event_flags) {
     sync_service_->ShowLoginDialog(GetWindow()->GetNativeWindow());
     return;
   }
+  if (source == privacy_dashboard_link_) {
+    BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
+    return;
+  }
   NOTREACHED() << "Invalid link source.";
 }
 
@@ -409,6 +414,12 @@ void ContentPageView::InitSyncGroup() {
   sync_action_link_->set_collapse_when_hidden(true);
   sync_action_link_->SetController(this);
 
+  privacy_dashboard_link_ = new views::Link();
+  privacy_dashboard_link_->set_collapse_when_hidden(true);
+  privacy_dashboard_link_->SetController(this);
+  privacy_dashboard_link_->SetText(
+      l10n_util::GetString(IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL));
+
   sync_start_stop_button_ = new views::NativeButton(this, std::wstring());
   sync_customize_button_ = new views::NativeButton(this, std::wstring());
 
@@ -438,6 +449,7 @@ void ContentPageView::InitSyncGroup() {
   layout->AddView(sync_customize_button_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
+  layout->AddView(privacy_dashboard_link_, 3, 1);
 
   sync_group_ = new OptionsGroupView(contents,
       l10n_util::GetString(IDS_SYNC_OPTIONS_GROUP_NAME), std::wstring(), true);
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index 7f19bdd..181f8a1 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -101,6 +101,7 @@ class ContentPageView : public OptionsPageView,
   views::Link* sync_action_link_;
   views::NativeButton* sync_start_stop_button_;
   views::NativeButton* sync_customize_button_;
+  views::Link* privacy_dashboard_link_;
 
   BooleanPrefMember ask_to_save_passwords_;
   BooleanPrefMember form_autofill_enabled_;