summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 22:14:34 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 22:14:34 +0000
commit2098fc80beaf21ef93d7fe3e886d185ce871b423 (patch)
treeb6b42db84ebb48f6bc8719e0980e7b27d98887a3 /chrome/app
parentd12f1471a7d9a5d82de92990cf82e21957fdc3ff (diff)
downloadchromium_src-2098fc80beaf21ef93d7fe3e886d185ce871b423.zip
chromium_src-2098fc80beaf21ef93d7fe3e886d185ce871b423.tar.gz
chromium_src-2098fc80beaf21ef93d7fe3e886d185ce871b423.tar.bz2
Back out r121057 from the trunk due to a compile failure.
http://build.chromium.org/p/chromium/builders/Win%20Aura/builds/5477/steps/compile/logs/stdio Use PluginInstaller to update outdated plug-ins. TBR=arv@chromium.org BUG=92796 TEST=TBD Review URL: http://codereview.chromium.org/9107038 TBR=bauerb@chromium.org Review URL: https://chromiumcodereview.appspot.com/9348073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d2889d9..1a9170b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5312,9 +5312,6 @@ Because search results are requested even while you're typing your query, your d
<message name="IDS_PLUGIN_INSTALLING" desc="The placeholder text when installing a missing plug-in.">
After installing the plug-in, reload the page.
</message>
- <message name="IDS_PLUGIN_UPDATING" desc="The placeholder text when updating an out-of-date plug-in.">
- After updating the plug-in, reload the page.
- </message>
<message name="IDS_PLUGIN_FOUND" desc="The placeholder text for a known plug-in that is not installed.">
The <ph name="PLUGIN_NAME">$1<ex>Quicktime</ex></ph> plug-in is required to display this content.
</message>
@@ -9573,9 +9570,6 @@ experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>"
<message name="IDS_PLUGININSTALLER_PROBLEMSINSTALLING" desc="Infobar text for link to help center">
Problems installing?
</message>
- <message name="IDS_PLUGININSTALLER_PROBLEMSUPDATING" desc="Infobar text for link to help center">
- Problems updating?
- </message>
<message name="IDS_PLUGIN_OUTDATED_PROMPT" desc="Info Bar message when an outdated plugin was disabled">
The <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> plug-in was blocked because it is out of date.
</message>