summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 22:32:09 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 22:32:09 +0000
commit018cbb25b18f517870d08706cc0b367a6ae04a82 (patch)
tree3d4ee68ab12bdff434d56a7c1470ddae01d184d6 /chrome/app
parentb9a208ec757291910b3d7952db53b88c3cca5b7f (diff)
downloadchromium_src-018cbb25b18f517870d08706cc0b367a6ae04a82.zip
chromium_src-018cbb25b18f517870d08706cc0b367a6ae04a82.tar.gz
chromium_src-018cbb25b18f517870d08706cc0b367a6ae04a82.tar.bz2
Adds confirm dialog when enabling instant.
BUG=58567 TEST=none Review URL: http://codereview.chromium.org/3710002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd12
-rw-r--r--chrome/app/resources/locale_settings.grd6
2 files changed, 15 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index dd54f07..400f0e37 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4013,15 +4013,21 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
<!-- Instant -->
- <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant">
- Enable Instant for faster searching?
- </message>
<message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibox dropdown for enabling instant">
Enable...
</message>
<message name="IDS_INSTANT_OPT_IN_NO_THANKS" desc="Button shown in the omnibox dropdodown for not enabling instant">
No thanks
</message>
+ <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant">
+ Enable Instant for faster searching and browsing?
+ </message>
+ <message name="IDS_INSTANT_OPT_IN_TITLE" desc="Title of the instant opt-in dialog">
+ Instant
+ </message>
+ <message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the instant opt-in dialog">
+ Instant lets you view web pages and search results faster than ever!\n\nWith Instant enabled, most web pages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default search engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause new search results are requested each time you press a key, anything you type into the omnibox may be logged as a search query by your default search engine.\n\n
+ </message>
<!-- Click-to-load -->
<message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug-in, displayed in the click-to-play UI.">
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 305f0b5..bbe300f 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -700,6 +700,12 @@
<message name="IDS_SIMPLE_CONTENT_EXCEPTION_DIALOG_HEIGHT_LINES" use_name_for_id="true">
16
</message>
+
+ <!-- The width of the Instant confirm dialog box in characters. -->
+ <message name="IDS_INSTANT_CONFIRM_DIALOG_WIDTH_CHARS" use_name_for_id="true">
+ 95
+ </message>
+
<if expr="pp_ifdef('chromeos')">
<!-- The width and height of the Languages and Input dialog box in -->
<!-- characters and lines (See above). -->