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

Side by Side Diff: extensions/browser/api/guest_view/guest_view_internal_api.cc

Issue 800543005: Revert of Implemented explicit resizing from guestview. (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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/guest_view/guest_view_internal_api.h" 5 #include "extensions/browser/api/guest_view/guest_view_internal_api.h"
6 6
7 #include "content/public/browser/render_process_host.h" 7 #include "content/public/browser/render_process_host.h"
8 #include "content/public/browser/render_view_host.h" 8 #include "content/public/browser/render_view_host.h"
9 #include "extensions/browser/guest_view/guest_view_base.h" 9 #include "extensions/browser/guest_view/guest_view_base.h"
10 #include "extensions/browser/guest_view/guest_view_manager.h" 10 #include "extensions/browser/guest_view/guest_view_manager.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 EXTENSION_FUNCTION_VALIDATE(params.get()); 72 EXTENSION_FUNCTION_VALIDATE(params.get());
73 GuestViewBase* guest = GuestViewBase::From( 73 GuestViewBase* guest = GuestViewBase::From(
74 render_view_host()->GetProcess()->GetID(), params->instance_id); 74 render_view_host()->GetProcess()->GetID(), params->instance_id);
75 if (!guest) 75 if (!guest)
76 return false; 76 return false;
77 guest->Destroy(); 77 guest->Destroy();
78 SendResponse(true); 78 SendResponse(true);
79 return true; 79 return true;
80 } 80 }
81 81
82 GuestViewInternalSetSizeFunction::GuestViewInternalSetSizeFunction() { 82 GuestViewInternalSetAutoSizeFunction::
83 GuestViewInternalSetAutoSizeFunction() {
83 } 84 }
84 85
85 GuestViewInternalSetSizeFunction::~GuestViewInternalSetSizeFunction() { 86 GuestViewInternalSetAutoSizeFunction::
87 ~GuestViewInternalSetAutoSizeFunction() {
86 } 88 }
87 89
88 bool GuestViewInternalSetSizeFunction::RunAsync() { 90 bool GuestViewInternalSetAutoSizeFunction::RunAsync() {
89 scoped_ptr<guest_view_internal::SetSize::Params> params( 91 scoped_ptr<guest_view_internal::SetAutoSize::Params> params(
90 guest_view_internal::SetSize::Params::Create(*args_)); 92 guest_view_internal::SetAutoSize::Params::Create(*args_));
91 EXTENSION_FUNCTION_VALIDATE(params.get()); 93 EXTENSION_FUNCTION_VALIDATE(params.get());
92 GuestViewBase* guest = GuestViewBase::From( 94 GuestViewBase* guest = GuestViewBase::From(
93 render_view_host()->GetProcess()->GetID(), params->instance_id); 95 render_view_host()->GetProcess()->GetID(), params->instance_id);
94 if (!guest) 96 if (!guest)
95 return false; 97 return false;
96 98 guest->SetAutoSize(params->params.enable_auto_size,
97 SetSizeParams set_size_params; 99 gfx::Size(params->params.min.width,
98 if (params->params.enable_auto_size) { 100 params->params.min.height),
99 set_size_params.enable_auto_size.reset( 101 gfx::Size(params->params.max.width,
100 params->params.enable_auto_size.release()); 102 params->params.max.height));
101 }
102 if (params->params.min) {
103 set_size_params.min_size.reset(
104 new gfx::Size(params->params.min->width, params->params.min->height));
105 }
106 if (params->params.max) {
107 set_size_params.max_size.reset(
108 new gfx::Size(params->params.max->width, params->params.max->height));
109 }
110 if (params->params.normal) {
111 set_size_params.normal_size.reset(new gfx::Size(
112 params->params.normal->width, params->params.normal->height));
113 }
114
115 guest->SetSize(set_size_params);
116 SendResponse(true); 103 SendResponse(true);
117 return true; 104 return true;
118 } 105 }
119 106
120 } // namespace extensions 107 } // namespace extensions
OLDNEW
« 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