diff options
| author | guohui@chromium.org <guohui@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 17:01:44 +0000 |
|---|---|---|
| committer | guohui@chromium.org <guohui@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 17:01:44 +0000 |
| commit | 22aa4f87dafd3b5071c74ec8666ab90696cc4811 (patch) | |
| tree | 1c4976a830bcee881cc2f07f50208c72d1803f7f /content/renderer/browser_plugin | |
| parent | 616965f6faf9d4c2c18f5efd5a118d8511ccc929 (diff) | |
| download | chromium_src-22aa4f87dafd3b5071c74ec8666ab90696cc4811.zip chromium_src-22aa4f87dafd3b5071c74ec8666ab90696cc4811.tar.gz chromium_src-22aa4f87dafd3b5071c74ec8666ab90696cc4811.tar.bz2 | |
Support webview tag when the container ext/app is embedded in a webUI
Design doc at https://docs.google.com/a/google.com/document/d/1LcriMmLY76IUhFO5rWh3Tz6xDFkGPNnL4MYSIBD4Jbc/edit#
BUG=285151
R=cdn@chromium.org, creis@chromium.org, fsamuel@chromium.org, jochen@chromium.org
Review URL: https://codereview.chromium.org/23530029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/browser_plugin')
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.cc | 2 | ||||
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 71aac85..77af957 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -90,6 +90,7 @@ BrowserPlugin::BrowserPlugin( mouse_locked_(false), browser_plugin_manager_(render_view->GetBrowserPluginManager()), compositing_enabled_(false), + embedder_frame_url_(frame->document().url()), weak_ptr_factory_(this) { } @@ -374,6 +375,7 @@ void BrowserPlugin::Attach(scoped_ptr<base::DictionaryValue> extra_params) { attach_params.storage_partition_id = storage_partition_id_; attach_params.persist_storage = persist_storage_; attach_params.src = GetSrcAttribute(); + attach_params.embedder_frame_url = embedder_frame_url_; GetDamageBufferWithSizeParams(&attach_params.auto_size_params, &attach_params.resize_guest_params, false); diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index ba30ac9..9e0b60c 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -354,6 +354,9 @@ class CONTENT_EXPORT BrowserPlugin : // Used to identify the plugin to WebBindings. scoped_ptr<struct _NPP> npp_; + // URL for the embedder frame. + GURL embedder_frame_url_; + // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might // get called after BrowserPlugin has been destroyed. base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_; |