diff options
| author | dominich@google.com <dominich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:39:10 +0000 |
|---|---|---|
| committer | dominich@google.com <dominich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:39:10 +0000 |
| commit | 36492a3bb4df223e44e392d8a3467be9fef51a6e (patch) | |
| tree | 33b428079b5fd409bbebaeefad6ef9a598899963 /chrome/app | |
| parent | 351676e05007b8eb8d124f9d2cce80108ed314a1 (diff) | |
| download | chromium_src-36492a3bb4df223e44e392d8a3467be9fef51a6e.zip chromium_src-36492a3bb4df223e44e392d8a3467be9fef51a6e.tar.gz chromium_src-36492a3bb4df223e44e392d8a3467be9fef51a6e.tar.bz2 | |
Adding prerender to task manager
BUG=75191
TEST=Start a prerender (search for cnn) and observe that a Prerender item appears in the Task Manager. Observe that it disappears when the prerender expires or you navigate to the page.
Review URL: http://codereview.chromium.org/6746010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a74f0d0..7bb0ad6 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3485,6 +3485,9 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. <message name="IDS_TASK_MANAGER_PLUGIN_PREFIX" desc="The prefix for a Task Manager plugin row"> Plug-in: <ph name="PLUGIN_NAME">$1<ex>Unknown Plug-in</ex></ph> (<ph name="PLUGIN_VERSION">$2<ex>3.4.255.1b</ex></ph>) </message> + <message name="IDS_TASK_MANAGER_PRERENDER_PREFIX" desc="The prefix for a Task Manager prerender row"> + Prerender: <ph name="PRERENDER_CONTENTS_NAME">$1<ex>http://www.google.com</ex></ph> + </message> <message name="IDS_TASK_MANAGER_UNKNOWN_PLUGIN_NAME" desc="The prefix for a Task Manager plugin row"> Unknown plug-in </message> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index d674465..1aef792 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -309,6 +309,7 @@ <include name="IDR_PAGEINFO_WARNING_MAJOR" file="pageinfo_warning_major.png" type="BINDATA" /> <include name="IDR_PAGEINFO_WARNING_MINOR" file="pageinfo_warning_minor.png" type="BINDATA" /> <include name="IDR_PLUGIN" file="plugin.png" type="BINDATA" /> + <include name="IDR_PRERENDER" file="prerender_succeed_icon.png" type="BINDATA" /> <include name="IDR_PRERENDER_FAIL_ICON" file="prerender_fail_icon.png" type="BINDATA"/> <include name="IDR_PRERENDER_SUCCEED_ICON" file="prerender_succeed_icon.png" type="BINDATA"/> <if expr="pp_ifdef('_google_chrome')"> |