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

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: Addressed comment by kalman@. 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..01382938cc1fa1ef9493ad78c37b1a53fc5510a6 100644
--- a/extensions/browser/extension_message_filter.cc
+++ b/extensions/browser/extension_message_filter.cc
@@ -177,10 +177,7 @@ 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) {
+ const ExtensionHostMsg_CreateMimeHandlerViewGuest_Params& params) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
GuestViewManager* manager =
GuestViewManager::FromBrowserContext(browser_context_);
@@ -197,14 +194,21 @@ void ExtensionMessageFilter::OnExtensionCreateMimeHandlerViewGuest(
GuestViewManager::WebContentsCreatedCallback callback =
base::Bind(&ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback,
this,
- element_instance_id,
+ params.element_instance_id,
render_process_id_,
render_frame_id,
- src);
+ params.embedder_url,
+ params.element_size);
+
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);
+ create_params.SetString(mime_handler_view::kMimeType, params.mime_type);
+ create_params.SetString(mime_handler_view::kSrc, params.embedder_url);
+ create_params.SetString(mime_handler_view::kContentUrl, params.content_url);
+ create_params.SetInteger(guestview::kElementWidth,
+ params.element_size.width());
+ create_params.SetInteger(guestview::kElementHeight,
+ params.element_size.height());
+
manager->CreateGuest(MimeHandlerViewGuest::Type,
embedder_web_contents,
create_params,
@@ -296,6 +300,7 @@ void ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback(
int embedder_render_process_id,
int embedder_render_frame_id,
const std::string& src,
+ const gfx::Size& element_size,
content::WebContents* web_contents) {
GuestViewManager* manager =
GuestViewManager::FromBrowserContext(browser_context_);
@@ -315,6 +320,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