summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 16:05:28 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 16:05:28 +0000
commit85da1b8a8bf56b3596f2150a66537810a54d18eb (patch)
tree14c880ba506115e77581a8e0eaa2eb99008509b2 /chrome/app
parent3bed26a4bf5a41484a002b337d8643741592e3cc (diff)
downloadchromium_src-85da1b8a8bf56b3596f2150a66537810a54d18eb.zip
chromium_src-85da1b8a8bf56b3596f2150a66537810a54d18eb.tar.gz
chromium_src-85da1b8a8bf56b3596f2150a66537810a54d18eb.tar.bz2
Adding a "Loading, please wait" message to about:conflicts.
BUG=None TEST=Type in about:conflicts, you should briefly see a "please wait" message appear and then disappear when the module list has been compiled. Review URL: http://codereview.chromium.org/6850013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 3cd1438..a531ddc 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4303,6 +4303,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_CONFLICTS_HEADER_HELP_TIP" desc="The 'Help tip:' header for each module item in the list">
Help tip
</message>
+ <message name="IDS_CONFLICTS_LOADING_MESSAGE" desc="Shown while loading until full list of modules is retrieved">
+ Loading...
+ </message>
<message name="IDS_CONFLICTS_NOT_LOADED_YET" desc="Shown next to a module that has not been loaded into memory yet">
Not loaded yet
</message>