extensions/browser/guest_view/extension_options/extension_options_guest.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/browser/guest_view/extension_options/extension_options_guest.cc

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed Mac Build + GN Test builds 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

« components/components_tests.gyp ('K') | « extensions/browser/guest_view/extension_options/extension_options_guest.h ('k') | extensions/browser/guest_view/extension_view/extension_view_guest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/extension_options/extension_options_guest.cc

diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc

index 9a60a515e3176891f31342cff2221624212c0e70..43f14436ec837b1ce31bbec5355b403a7fc80382 100644

--- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc

+++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc

@@ -6,6 +6,8 @@

#include "base/values.h"

#include "components/crx_file/id_util.h"

+#include "components/guest_view/browser/guest_view_event.h"

+#include "components/guest_view/browser/guest_view_manager.h"

#include "content/public/browser/navigation_details.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/site_instance.h"

@@ -18,8 +20,6 @@

#include "extensions/browser/extension_web_contents_observer.h"

#include "extensions/browser/guest_view/extension_options/extension_options_constants.h"

#include "extensions/browser/guest_view/extension_options/extension_options_guest_delegate.h"

-#include "extensions/browser/guest_view/guest_view_event.h"

-#include "extensions/browser/guest_view/guest_view_manager.h"

#include "extensions/common/api/extension_options_internal.h"

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

@@ -30,6 +30,8 @@

#include "ipc/ipc_message_macros.h"

using content::WebContents;

+using guestview::GuestViewBase;

+using guestview::GuestViewEvent;

using namespace extensions::core_api;

namespace extensions {

@@ -49,7 +51,7 @@ ExtensionOptionsGuest::~ExtensionOptionsGuest() {

}

// static

-extensions::GuestViewBase* ExtensionOptionsGuest::Create(

+GuestViewBase* ExtensionOptionsGuest::Create(

content::WebContents* owner_web_contents) {

return new ExtensionOptionsGuest(owner_web_contents);

}