Gtk first run: Remove obsolete warning for unimplemented privacy features.

Add learn more link after crash reporting checkbox.

BUG=none
TEST=build google release build, launch with empty user-data-dir, click learn more link - should open in default browser.

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

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

3 files changed, 33 insertions, 19 deletions

diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 9ad10fa..90d69a1 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -534,6 +534,11 @@
         http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=[GRITLANGCODE]
       </message>
 
+      <!-- The URL for the "Learn more" page for the usage/crash reporting option in the first run dialog. -->
+      <message name="IDS_LEARN_MORE_REPORTING_URL" translateable="false">
+        http://www.google.com/support/chrome/bin/answer.py?answer=96817&amp;hl=[GRITLANGCODE]
+      </message>
+
       <!-- The width and height of the bookmark manager in characters and lines -->
       <!-- (See above). -->
       <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS" use_name_for_id="true">
diff --git a/chrome/browser/gtk/first_run_dialog.cc b/chrome/browser/gtk/first_run_dialog.cc
index 9bdc692..bac0ca2 100644
--- a/chrome/browser/gtk/first_run_dialog.cc
+++ b/chrome/browser/gtk/first_run_dialog.cc
@@ -8,8 +8,10 @@
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "chrome/app/breakpad_linux.h"
+#include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/gtk_util.h"
+#include "chrome/common/platform_util.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
@@ -53,29 +55,27 @@ FirstRunDialog::FirstRunDialog(Profile* profile, int& response)
   GtkWidget* vbox = gtk_vbox_new(FALSE, 12);
 
 #if defined(GOOGLE_CHROME_BUILD)
-  // TODO(port): remove this warning before beta release when we have all the
-  // privacy features working.
-  GtkWidget* privacy_label = gtk_label_new(
-      "This version of Google Chrome for Linux is not appropriate for "
-      "general consumer use.  Certain privacy features are unavailable "
-      "at this time as described in our privacy policy at");
-  gtk_misc_set_alignment(GTK_MISC(privacy_label), 0, 0);
-  gtk_label_set_line_wrap(GTK_LABEL(privacy_label), TRUE);
-  gtk_box_pack_start(GTK_BOX(vbox), privacy_label, FALSE, FALSE, 0);
-
-  GtkWidget* url_label = gtk_label_new(NULL);
-  gtk_label_set_markup(GTK_LABEL(url_label),
-      "<tt>http://www.google.com/chrome/intl/en/privacy_linux.html</tt>");
-  // Set selectable to allow copy and paste.
-  gtk_label_set_selectable(GTK_LABEL(url_label), TRUE);
-  gtk_box_pack_start(GTK_BOX(vbox), url_label, FALSE, FALSE, 0);
-
-  report_crashes_ = gtk_check_button_new();
   GtkWidget* check_label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ENABLE_LOGGING).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(check_label), TRUE);
+
+  GtkWidget* learn_more_link = gtk_chrome_link_button_new(
+      l10n_util::GetStringUTF8(IDS_LEARN_MORE).c_str());
+  // Stick it in an hbox so it doesn't expand to the whole width.
+  GtkWidget* learn_more_hbox = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(learn_more_hbox),
+                     gtk_util::IndentWidget(learn_more_link),
+                     FALSE, FALSE, 0);
+  g_signal_connect(learn_more_link, "clicked",
+                   G_CALLBACK(OnLearnMoreLinkClicked), this);
+
+  report_crashes_ = gtk_check_button_new();
   gtk_container_add(GTK_CONTAINER(report_crashes_), check_label);
-  gtk_box_pack_start(GTK_BOX(vbox), report_crashes_, FALSE, FALSE, 0);
+
+  GtkWidget* report_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+  gtk_box_pack_start(GTK_BOX(report_vbox), report_crashes_, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(report_vbox), learn_more_hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), report_vbox, FALSE, FALSE, 0);
 #endif
 
   make_default_ = gtk_check_button_new_with_label(
@@ -162,6 +162,13 @@ void FirstRunDialog::OnDialogResponse(GtkWidget* widget, int response) {
     FirstRunDone();
 }
 
+// static
+void FirstRunDialog::OnLearnMoreLinkClicked(GtkButton *button,
+                                            FirstRunDialog* first_run) {
+  platform_util::OpenExternal(GURL(
+      l10n_util::GetStringUTF8(IDS_LEARN_MORE_REPORTING_URL)));
+}
+
 void FirstRunDialog::FirstRunDone() {
   // Set preference to show first run bubble and welcome page.
   FirstRun::SetShowFirstRunBubblePref();
diff --git a/chrome/browser/gtk/first_run_dialog.h b/chrome/browser/gtk/first_run_dialog.h
index bc68362..5d28d4c6 100644
--- a/chrome/browser/gtk/first_run_dialog.h
+++ b/chrome/browser/gtk/first_run_dialog.h
@@ -31,6 +31,8 @@ class FirstRunDialog : public ImportObserver {
     user_data->OnDialogResponse(widget, response);
   }
   void OnDialogResponse(GtkWidget* widget, int response);
+  static void OnLearnMoreLinkClicked(GtkButton *button,
+                                     FirstRunDialog* first_run);
 
   // This method closes the first run window and quits the message loop so that
   // the Chrome startup can continue. This should be called when all the