Add the new dialog for AddSearchProvider.

BUG=38475
TEST=Tested using a page that does this for both the Chromium and Google Chrome switch from a known provider to unknown and from an unknown provider.

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

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

4 files changed, 19 insertions, 11 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 001e26d..c622a61 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -418,9 +418,6 @@ be available for now. -->
       <message name="IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT" desc="More compact text to show in the default browser query infobar.">
         Chromium isn't your default browser.
       </message>
-      <message name="IDS_DEFAULT_SEARCH_PROMPT" desc="The message displayed when javascript has asked to change the default search engine. This appears in a message box.">
-        Would you like to make <ph name="HOST">$1<ex>www.bing.com</ex></ph> your search engine in Chromium?
-      </message>
       <!-- Try Chrome Toast Dialog -->
       <message name="IDS_TRY_TOAST_HEADING" desc="Top line of the try-chrome-again dialog">
         There is a new version of Chromium available.
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 9be6fb7..ffb8948 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1205,15 +1205,24 @@ each locale. -->
         <ph name="ENGINE_NAME">$1<ex>Google</ex></ph> (Default)
       </message>
 
-      <message name="IDS_DEFAULT_SEARCH_PROMPT_TITLE" desc="The title of the default search engine dialog. This dialog asks if the user would like a new default search engine.">
+      <message name="IDS_DEFAULT_SEARCH_TITLE" desc="The title of the default search engine dialog. This dialog asks if the user would like to set a new default search engine.">
         Change Default Search Engine
       </message>
 
-      <message name="IDS_DEFAULT_SEARCH_PROMPT_OK" desc="The button which accepts a new default search engine. Displayed in the default search engine message box.">
-        Change it
+      <message name="IDS_DEFAULT_SEARCH_SUMMARY" desc="Text at the top of the dialog to explain why the dialog is displayed. Displayed in the default search engine dialog.">
+        <ph name="ENGINE_HOST_NAME">$1<ex>google.com</ex></ph> wants to be your search engine.
+       </message>
+      <message name="IDS_DEFAULT_SEARCH_LABEL_CURRENT" desc="The text above the button which keeps the current search engine. Displayed in the default search engine dialog.">
+        Current search engine:
       </message>
-      <message name="IDS_DEFAULT_SEARCH_PROMPT_CANCEL" desc="The button which rejects a new default search engine. Displayed in the default search engine message box.">
-        No, thanks
+      <message name="IDS_DEFAULT_SEARCH_LABEL_PROPOSED" desc="The text above the button which accepts a new default search engine. Displayed in the default search engine dialog.">
+        New search engine:
+      </message>
+      <message name="IDS_DEFAULT_SEARCH_PROMPT_PROPOSED" desc="The text below the button which accepts a new default search engine. Displayed in the default search engine dialog.">
+        Change to <ph name="ENGINE_NAME">$1<ex>Google</ex></ph>
+      </message>
+      <message name="IDS_DEFAULT_SEARCH_PROMPT_CURRENT" desc="The text below the button which keeps the current search engine. Displayed in the default search engine dialog.">
+        Keep using <ph name="ENGINE_NAME">$1<ex>Google</ex></ph>
       </message>
 
       <message name="IDS_TIME_SECS_DEFAULT"
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 4da3d44..21545cd4 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -468,9 +468,6 @@ Chrome supports. -->
       <message name="IDS_DEFAULT_BROWSER_INFOBAR_SHORT_TEXT" desc="More compact text to show in the default browser query infobar.">
         Google Chrome isn't your default browser.
       </message>
-      <message name="IDS_DEFAULT_SEARCH_PROMPT" desc="The message displayed when javascript has asked to change the default search engine. This appears in a message box.">
-        Would you like to make <ph name="HOST">$1<ex>www.bing.com</ex></ph> your search engine in Google Chrome?
-      </message>
       <!-- Try Chrome Toast Dialog -->
       <message name="IDS_TRY_TOAST_HEADING" desc="Top line of the try-chrome-again dialog">
         There is a new version of Google Chrome available.
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 3e5fa8a..c7853c5 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -710,6 +710,11 @@
           14
         </message>
       </if>
+
+      <!-- The width of the default search engine dialog in characters -->
+      <message name="IDS_DEFAULT_SEARCH_WIDTH_CHARS" use_name_for_id="true">
+        82
+      </message>
     </messages>
   </release>
 </grit>