Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: extensions/browser/extension_message_filter.cc

Issue 856563002: Added the infrastructure for surfaceProxy.onResize() and SurfaceView.onResize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/extension_message_filter.cc
diff --git a/extensions/browser/extension_message_filter.cc b/extensions/browser/extension_message_filter.cc
index 224a3f8d9f59daf057160a13794c4aae73322849..e99c9fe6ce1a1946b604a2ed791f81671afebb93 100644
--- a/extensions/browser/extension_message_filter.cc
+++ b/extensions/browser/extension_message_filter.cc
@@ -177,10 +177,8 @@ void ExtensionMessageFilter::OnExtensionAttachGuest(
void ExtensionMessageFilter::OnExtensionCreateMimeHandlerViewGuest(
int render_frame_id,
- const std::string& src,
- const std::string& content_url,
- const std::string& mime_type,
- int element_instance_id) {
+ int element_instance_id,
+ const base::DictionaryValue& create_params) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
GuestViewManager* manager =
GuestViewManager::FromBrowserContext(browser_context_);
@@ -194,17 +192,22 @@ void ExtensionMessageFilter::OnExtensionCreateMimeHandlerViewGuest(
if (!embedder_web_contents)
return;
+ std::string src;
+ int element_width;
+ int element_height;
+ create_params.GetString(mime_handler_view::kSrc, &src);
+ create_params.GetInteger(guestview::kElementWidth, &element_width);
+ create_params.GetInteger(guestview::kElementHeight, &element_height);
+ gfx::Size element_size(element_width, element_height);
+
GuestViewManager::WebContentsCreatedCallback callback =
base::Bind(&ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback,
this,
element_instance_id,
render_process_id_,
render_frame_id,
- src);
- base::DictionaryValue create_params;
- create_params.SetString(mime_handler_view::kMimeType, mime_type);
- create_params.SetString(mime_handler_view::kSrc, src);
- create_params.SetString(mime_handler_view::kContentUrl, content_url);
+ src,
+ element_size);
manager->CreateGuest(MimeHandlerViewGuest::Type,
embedder_web_contents,
create_params,
@@ -295,7 +298,8 @@ void ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback(
int element_instance_id,
int embedder_render_process_id,
int embedder_render_frame_id,
- const std::string& src,
+ std::string src,
Fady Samuel 2015/01/15 21:40:12 const reference
paulmeyer 2015/01/19 23:45:35 Done.
+ gfx::Size element_size,
Fady Samuel 2015/01/15 21:40:12 const reference
paulmeyer 2015/01/19 23:45:35 Done.
content::WebContents* web_contents) {
GuestViewManager* manager =
GuestViewManager::FromBrowserContext(browser_context_);
@@ -315,6 +319,8 @@ void ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback(
base::DictionaryValue attach_params;
attach_params.SetString(mime_handler_view::kSrc, src);
+ attach_params.SetInteger(guestview::kElementWidth, element_size.width());
+ attach_params.SetInteger(guestview::kElementHeight, element_size.height());
manager->AttachGuest(embedder_render_process_id,
rfh->GetRenderViewHost()->GetRoutingID(),
element_instance_id,

Powered by Google App Engine
This is Rietveld 408576698