extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc - Issue 1102173002: Move GuestView layer in browser to components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.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/renderer/guest_view/guest_view_internal_custom_bindings.cc ('k') | extensions/renderer/messaging_bindings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

index c8b6afa41a2a7af2d679d360fecc4b9cfcbaab34..67add2475005b2815c1801c212bd5d33d5707986 100644

--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

@@ -7,14 +7,14 @@

#include <map>

#include <set>

+#include "components/guest_view/common/guest_view_constants.h"

+#include "components/guest_view/common/guest_view_messages.h"

#include "content/public/child/v8_value_converter.h"

#include "content/public/renderer/render_frame.h"

#include "content/public/renderer/render_view.h"

#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"

#include "extensions/common/extension_messages.h"

#include "extensions/common/guest_view/extensions_guest_view_messages.h"

-#include "extensions/common/guest_view/guest_view_constants.h"

-#include "extensions/common/guest_view/guest_view_messages.h"

#include "gin/arguments.h"

#include "gin/dictionary.h"

#include "gin/handle.h"

@@ -264,7 +264,7 @@ void MimeHandlerViewContainer::PostMessageFromValue(

void MimeHandlerViewContainer::OnCreateMimeHandlerViewGuestACK(

int element_instance_id) {

- DCHECK_NE(this->element_instance_id(), guestview::kInstanceIDNone);

+ DCHECK_NE(this->element_instance_id(), guest_view::kInstanceIDNone);

DCHECK_EQ(this->element_instance_id(), element_instance_id);

if (!render_frame())

@@ -307,7 +307,7 @@ void MimeHandlerViewContainer::CreateMimeHandlerViewGuest() {

// The loader has completed loading |view_id_| so we can dispose it.

loader_.reset();

- DCHECK_NE(element_instance_id(), guestview::kInstanceIDNone);

+ DCHECK_NE(element_instance_id(), guest_view::kInstanceIDNone);

if (!render_frame())

return;

« no previous file with comments | « extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc ('k') | extensions/renderer/messaging_bindings.cc » ('j') | no next file with comments »