diff options
Diffstat (limited to 'chrome/browser/views/clear_server_data.cc')
| -rw-r--r-- | chrome/browser/views/clear_server_data.cc | 16 |
1 files changed, 10 insertions, 6 deletions
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); |