[uber] Redoing the homepage selection UI

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ef18b6dcc5d6ac3258155dc31068360906781ec9..a0ccc680018808da09e831216a6e1c6e0c7e4590 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8021,6 +8021,9 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
       <message name="IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB" desc="The label of the 'Show home page' startup option radio button">
         Open the home page
       </message>
+      <message name="IDS_OPTIONS2_STARTUP_SHOW_DEFAULT_AND_NEWTAB" desc="The label of the 'Show New Tab page' startup option radio button">
+        Open the New Tab page
+      </message>
       <message name="IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION" desc="The label of the 'Restore previously open pages' startup option radio button">
         Reopen the pages that were open last
       </message>
@@ -8070,6 +8073,21 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
       </if>
 
       <if expr="not pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS2_HOMEPAGE" desc="The label for the homepage selector">
+          Home Page:

[csilv, 2012/02/01 20:37:29]

You have the title-case and non-title case string switched.  However, this
string should always be non-titlecase, so remove it from this condition block
(along with the title case version below).

[Tyler Breisacher (Chromium), 2012/02/01 21:49:38]

Done.

+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_DIALOG_LABEL" desc="The label for the homepage textbox in the dialog">
+          Home Page:

[csilv, 2012/02/01 20:37:29]

ditto

[Tyler Breisacher (Chromium), 2012/02/01 21:49:38]

Done.

+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_NONE" desc="The option in the homepage selector indicating no home page">
+          None
+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_NTP" desc="The option in the homepage selector indicating the NTP is the home page">
+          New Tab page
+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_CHOOSE" desc="The option in the homepage selector for choosing a different home page">
+          Choose another...
+        </message>
         <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="The title of the home page group">
           Home page
         </message>
@@ -8084,6 +8102,21 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
+        <message name="IDS_OPTIONS2_HOMEPAGE" desc="In Title Case: The label for the homepage selector">
+          Home page:
+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_DIALOG_LABEL" desc="In Title Case: The label for the homepage textbox in the dialog">
+          Home Page:
+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_NONE" desc="In Title Case: The option in the homepage selector indicating no home page">
+          None
+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_NTP" desc="In Title Case: The option in the homepage selector indicating the NTP is the home page">
+          New Tab Page
+        </message>
+        <message name="IDS_OPTIONS2_HOMEPAGE_CHOOSE" desc="In Title Case: The option in the homepage selector for choosing a different home page">
+          Choose Another...
+        </message>
         <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="In Title Case: The title of the home page group">
           Home Page
         </message>
@@ -8109,12 +8142,6 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
       <message name="IDS_OPTIONS_CHANGE_HOME_PAGE" desc="The text of the button that allows the user to change her home page">
         Change page
       </message>
-      <message name="IDS_OPTIONS_SHOW_HOME_BUTTON_FOR_URL" desc="The label of the 'Show Home button' checkbox">
-        Show Home button for &lt;b&gt;<ph name="HOME_PAGE_URL">$1<ex>google.com/search</ex></ph>&lt;/b&gt;.
-      </message>
-      <message name="IDS_OPTIONS_SHOW_HOME_BUTTON_FOR_NTP" desc="The label of the 'Show Home button' checkbox">
-        Show Home button for the &lt;b&gt;New Tab Page&lt;/b&gt;.
-      </message>
       <message name="IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR" desc="The label of the 'Show bookmarks bar' checkbox">
         Always show the bookmarks bar
       </message>