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

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: Removed code from one non-essential function that was causing tests to fail. It will be re-added in… 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 050258238fa8cbe82f6e6acfc509187f3d46e416..b5545b70890330766d3c051dc40928ad2f4e3a30 100644
--- a/extensions/browser/extension_message_filter.cc
+++ b/extensions/browser/extension_message_filter.cc
@@ -178,7 +178,8 @@ void ExtensionMessageFilter::OnExtensionAttachGuest(
void ExtensionMessageFilter::OnExtensionCreateMimeHandlerViewGuest(
int render_frame_id,
const std::string& view_id,
- int element_instance_id) {
+ int element_instance_id,
+ const gfx::Size& element_size) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
GuestViewManager* manager =
GuestViewManager::FromBrowserContext(browser_context_);
@@ -192,11 +193,18 @@ void ExtensionMessageFilter::OnExtensionCreateMimeHandlerViewGuest(
if (!embedder_web_contents)
return;
- GuestViewManager::WebContentsCreatedCallback callback = base::Bind(
- &ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback, this,
- element_instance_id, render_process_id_, render_frame_id);
+ GuestViewManager::WebContentsCreatedCallback callback =
+ base::Bind(&ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback,
+ this,
+ element_instance_id,
+ render_process_id_,
+ render_frame_id,
+ element_size);
+
base::DictionaryValue create_params;
create_params.SetString(mime_handler_view::kViewId, view_id);
+ create_params.SetInteger(guestview::kElementWidth, element_size.width());
+ create_params.SetInteger(guestview::kElementHeight, element_size.height());
manager->CreateGuest(MimeHandlerViewGuest::Type,
embedder_web_contents,
create_params,
@@ -287,6 +295,7 @@ void ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback(
int element_instance_id,
int embedder_render_process_id,
int embedder_render_frame_id,
+ const gfx::Size& element_size,
content::WebContents* web_contents) {
GuestViewManager* manager =
GuestViewManager::FromBrowserContext(browser_context_);
@@ -305,6 +314,8 @@ void ExtensionMessageFilter::MimeHandlerViewGuestCreatedCallback(
return;
base::DictionaryValue attach_params;
+ 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