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

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

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's comments Created 5 years, 8 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
« no previous file with comments | « extensions/browser/DEPS ('k') | extensions/browser/guest_view/app_view/app_view_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 aea9c8ed8fc58d4a2c5090b3c8b57d13f1756a46..ac3c85b0f6c58c0503df9cac828ad21965b6409f 100644
--- a/extensions/browser/api/guest_view/guest_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/guest_view_internal_api.cc
@@ -4,16 +4,18 @@
#include "extensions/browser/api/guest_view/guest_view_internal_api.h"
+#include "components/guest_view/browser/guest_view_base.h"
+#include "components/guest_view/browser/guest_view_manager.h"
+#include "components/guest_view/common/guest_view_constants.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
-#include "extensions/browser/guest_view/guest_view_base.h"
-#include "extensions/browser/guest_view/guest_view_manager.h"
#include "extensions/common/api/guest_view_internal.h"
-#include "extensions/common/guest_view/guest_view_constants.h"
#include "extensions/common/permissions/permissions_data.h"
-using guestview::GuestViewManagerDelegate;
+using guest_view::GuestViewBase;
+using guest_view::GuestViewManager;
+using guest_view::GuestViewManagerDelegate;
namespace guest_view_internal = extensions::core_api::guest_view_internal;
@@ -53,7 +55,7 @@ bool GuestViewInternalCreateGuestFunction::RunAsync() {
// Add flag to |create_params| to indicate that the element size is specified
// in logical units.
- create_params->SetBoolean(guestview::kElementSizeIsLogical, true);
+ create_params->SetBoolean(guest_view::kElementSizeIsLogical, true);
guest_view_manager->CreateGuest(view_type,
sender_web_contents,
@@ -72,8 +74,8 @@ void GuestViewInternalCreateGuestFunction::CreateGuestCallback(
content_window_id = guest->proxy_routing_id();
}
scoped_ptr<base::DictionaryValue> return_params(new base::DictionaryValue());
- return_params->SetInteger(guestview::kID, guest_instance_id);
- return_params->SetInteger(guestview::kContentWindowID, content_window_id);
+ return_params->SetInteger(guest_view::kID, guest_instance_id);
+ return_params->SetInteger(guest_view::kContentWindowID, content_window_id);
SetResult(return_params.release());
SendResponse(true);
}
@@ -114,7 +116,7 @@ bool GuestViewInternalSetSizeFunction::RunAsync() {
if (!guest)
return false;
- SetSizeParams set_size_params;
+ guest_view::SetSizeParams set_size_params;
if (params->params.enable_auto_size) {
set_size_params.enable_auto_size.reset(
params->params.enable_auto_size.release());
« no previous file with comments | « extensions/browser/DEPS ('k') | extensions/browser/guest_view/app_view/app_view_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698