Remove descriptive text above import settings button. This also removes it for GTK, although GTK has not yet moved the Clear Data button to the third page of the options.

This also eliminates a number of not-referenced strings, and makes the options dialog shorter now that we have the space to do so.

BUG=35085
TEST=Open options dialog, look on second page, Import button should have no text above it.
Review URL: http://codereview.chromium.org/597013

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

5 files changed, 6 insertions, 46 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e53a000..89265b4 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5085,28 +5085,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Browsing Data
         </message>
       </if>
-      <message name="IDS_OPTIONS_BROWSING_DATA_INFO" desc="Information text about browsing data options.">
-        You can import your bookmarks and settings from other browsers or clear your browsing data from this computer.
-      </message>
-      <message name="IDS_OPTIONS_IMPORT_DATA_INFO" desc="Information text about import options.">
-        You can import your bookmarks and settings from other browsers and user accounts on this computer.
-      </message>
-      <message name="IDS_OPTIONS_IMPORT_DATA_GROUP_NAME" desc="The title of the 'Import' group.">
-        Import:
-      </message>
       <message name="IDS_OPTIONS_IMPORT_DATA_BUTTON" desc="Label for the import data button.">
         Import data from another browser...
       </message>
-      <message name="IDS_OPTIONS_CLEAR_DATA_GROUP_NAME" desc="The title of the 'Clear data' group.">
-        Clear Data:
-      </message>
-      <message name="IDS_OPTIONS_CLEAR_DATA_INFO" desc="Information text about clear data options.">
-        Clear your browsing data from this computer. Be aware that this may adversely affect the contents of the New Tab Page.
-      </message>
-      <message name="IDS_OPTIONS_CLEAR_DATA_BUTTON" desc="Label for the Clear data button.">
-        Clear browsing data...
-      </message>
-
 
       <!-- Misc advanced option description strings. -->
       <message name="IDS_WEBKIT_JAVA_ENABLED_DESCRIPTION" desc="In the advanced options tab, the text next to the checkbox that enables Java.">
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 3d47763..aab9ab5 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -256,7 +256,7 @@
       <!-- The height of the Options dialog box, in lines (line height = character -->
       <!-- height for default dialog box font) -->
       <message name="IDS_OPTIONS_DIALOG_HEIGHT_LINES" use_name_for_id="true">
-        39
+        36
       </message>
 
       <!-- The width of the title column of the Options dialog box, in characters (see -->
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 0f97bc3..7461cce 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -227,15 +227,6 @@ GtkWidget* ContentPageGtk::InitFormAutofillGroup() {
 GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
-  // Browsing data label.
-  GtkWidget* browsing_data_label = gtk_label_new(
-      l10n_util::GetStringUTF8(IDS_OPTIONS_BROWSING_DATA_INFO).c_str());
-  gtk_util::WrapLabelAtAllocationHack(browsing_data_label);
-
-  gtk_label_set_line_wrap(GTK_LABEL(browsing_data_label), TRUE);
-  gtk_misc_set_alignment(GTK_MISC(browsing_data_label), 0, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), browsing_data_label, FALSE, FALSE, 0);
-
   // Horizontal two button layout.
   GtkWidget* button_hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(vbox), button_hbox);
@@ -248,8 +239,10 @@ GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
   gtk_box_pack_start(GTK_BOX(button_hbox), import_button, FALSE, FALSE, 0);
 
   // Clear data button.
+  // TODO(pkasting): This should move to the advanced settings page (see
+  // Windows).
   GtkWidget* clear_data_button = gtk_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_OPTIONS_CLEAR_DATA_BUTTON).c_str());
+      l10n_util::GetStringUTF8(IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON).c_str());
   g_signal_connect(G_OBJECT(clear_data_button), "clicked",
                    G_CALLBACK(OnClearBrowsingDataButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(button_hbox), clear_data_button, FALSE, FALSE, 0);
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 106f187..e28f6a3 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -58,7 +58,6 @@ ContentPageView::ContentPageView(Profile* profile)
       themes_group_(NULL),
       themes_reset_button_(NULL),
       themes_gallery_link_(NULL),
-      browsing_data_label_(NULL),
       browsing_data_group_(NULL),
       import_button_(NULL),
       sync_group_(NULL),
@@ -239,8 +238,6 @@ void ContentPageView::Layout() {
       0, 0, passwords_group_->GetContentsWidth(), 0);
   passwords_neversave_radio_->SetBounds(
       0, 0, passwords_group_->GetContentsWidth(), 0);
-  browsing_data_label_->SetBounds(
-      0, 0, browsing_data_group_->GetContentsWidth(), 0);
   if (is_initialized()) {
     sync_status_label_->SetBounds(
         0, 0, sync_group_->GetContentsWidth(), 0);
@@ -383,10 +380,6 @@ void ContentPageView::InitThemesGroup() {
 void ContentPageView::InitBrowsingDataGroup() {
   import_button_ = new views::NativeButton(this,
       l10n_util::GetString(IDS_OPTIONS_IMPORT_DATA_BUTTON));
-  browsing_data_label_ = new views::Label(
-      l10n_util::GetString(IDS_OPTIONS_BROWSING_DATA_INFO));
-  browsing_data_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  browsing_data_label_->SetMultiLine(true);
 
   using views::GridLayout;
   using views::ColumnSet;
@@ -395,18 +388,12 @@ void ContentPageView::InitBrowsingDataGroup() {
   GridLayout* layout = new GridLayout(contents);
   contents->SetLayoutManager(layout);
 
-  // Add the browsing data label component.
+  // Add the browsing data import button.
   const int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, single_column_view_set_id);
-  layout->AddView(browsing_data_label_);
-
-  // Add some padding for not making the next component close together.
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
-
-  layout->StartRow(0, single_column_view_set_id);
   layout->AddView(import_button_);
 
   browsing_data_group_ = new OptionsGroupView(
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index 22db400..0688c15 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -93,7 +93,6 @@ class ContentPageView : public OptionsPageView,
 
   // Controls for the browsing data group.
   OptionsGroupView* browsing_data_group_;
-  views::Label* browsing_data_label_;
   views::NativeButton* import_button_;
 
   // Controls for the Sync group.