summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 20:10:20 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 20:10:20 +0000
commit90dba0763114f7f07d24e751cfd1c6bba0480dad (patch)
treedf088d6e1f3a683623785d8dac2390abe6355589 /chrome/common
parent92e44ddd24903955bea38d01e2fbc7e4b1156d8f (diff)
downloadchromium_src-90dba0763114f7f07d24e751cfd1c6bba0480dad.zip
chromium_src-90dba0763114f7f07d24e751cfd1c6bba0480dad.tar.gz
chromium_src-90dba0763114f7f07d24e751cfd1c6bba0480dad.tar.bz2
Don't load plugins on prerendered pages until the pages are displayed.
BUG=61745 TEST=in progress Review URL: http://codereview.chromium.org/6247013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/render_messages_internal.h3
-rw-r--r--chrome/common/render_messages_params.cc4
-rw-r--r--chrome/common/render_messages_params.h3
3 files changed, 10 insertions, 0 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index f2c588c..867523a 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -566,6 +566,9 @@ IPC_MESSAGE_CONTROL1(ViewMsg_PurgePluginListCache,
// Tells the render view to load all blocked plugins.
IPC_MESSAGE_ROUTED0(ViewMsg_LoadBlockedPlugins)
+// Tells the render view a prerendered page is about to be displayed.
+IPC_MESSAGE_ROUTED0(ViewMsg_DisplayPrerenderedPage)
+
IPC_MESSAGE_ROUTED1(ViewMsg_RunFileChooserResponse,
std::vector<FilePath> /* selected files */)
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index a05266c..91d7ba7 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -316,6 +316,10 @@ struct ParamTraits<ViewMsg_Navigate_Params::NavigationType> {
event = "NavigationType_RESTORE";
break;
+ case ViewMsg_Navigate_Params::PRERENDER:
+ event = "NavigationType_PRERENDER";
+ break;
+
case ViewMsg_Navigate_Params::NORMAL:
event = "NavigationType_NORMA";
break;
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 09d18e0..20d8470 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -62,6 +62,9 @@ struct ViewMsg_Navigate_Params {
// the page's cache policy is ignored and we load from the cache.
RESTORE,
+ // Speculatively prerendering the page.
+ PRERENDER,
+
// Navigation type not categorized by the other types.
NORMAL
};