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

Unified Diff: extensions/browser/api/guest_view/guest_view_internal_api.cc

Issue 847893002: Implemented explicit resizing from guestview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. 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/api/guest_view/guest_view_internal_api.cc
diff --git a/extensions/browser/api/guest_view/guest_view_internal_api.cc b/extensions/browser/api/guest_view/guest_view_internal_api.cc
index fa4201e2e005ec88bacc1e33769faad354359796..29dca9f562091eb5aae775bcdb3ca747d4ec3713 100644
--- a/extensions/browser/api/guest_view/guest_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/guest_view_internal_api.cc
@@ -79,27 +79,40 @@ bool GuestViewInternalDestroyGuestFunction::RunAsync() {
return true;
}
-GuestViewInternalSetAutoSizeFunction::
- GuestViewInternalSetAutoSizeFunction() {
+GuestViewInternalSetSizeFunction::GuestViewInternalSetSizeFunction() {
}
-GuestViewInternalSetAutoSizeFunction::
- ~GuestViewInternalSetAutoSizeFunction() {
+GuestViewInternalSetSizeFunction::~GuestViewInternalSetSizeFunction() {
}
-bool GuestViewInternalSetAutoSizeFunction::RunAsync() {
- scoped_ptr<guest_view_internal::SetAutoSize::Params> params(
- guest_view_internal::SetAutoSize::Params::Create(*args_));
+bool GuestViewInternalSetSizeFunction::RunAsync() {
+ scoped_ptr<guest_view_internal::SetSize::Params> params(
+ guest_view_internal::SetSize::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
GuestViewBase* guest = GuestViewBase::From(
render_view_host()->GetProcess()->GetID(), params->instance_id);
if (!guest)
return false;
- guest->SetAutoSize(params->params.enable_auto_size,
- gfx::Size(params->params.min.width,
- params->params.min.height),
- gfx::Size(params->params.max.width,
- params->params.max.height));
+
+ extensions::SetSizeParams set_size_params;
Fady Samuel 2015/01/13 00:20:04 nit: Are we not already in the extensions namespac
+ if (params->params.enable_auto_size) {
+ set_size_params.enable_auto_size.reset(
+ params->params.enable_auto_size.release());
+ }
+ if (params->params.min) {
+ set_size_params.min_size.reset(
+ new gfx::Size(params->params.min->width, params->params.min->height));
+ }
+ if (params->params.max) {
+ set_size_params.max_size.reset(
+ new gfx::Size(params->params.max->width, params->params.max->height));
+ }
+ if (params->params.normal) {
+ set_size_params.normal_size.reset(new gfx::Size(
+ params->params.normal->width, params->params.normal->height));
+ }
+
+ guest->SetSize(set_size_params);
SendResponse(true);
return true;
}
« no previous file with comments | « extensions/browser/api/guest_view/guest_view_internal_api.h ('k') | extensions/browser/guest_view/guest_view_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698