chrome/browser/profiles/off_the_record_profile_impl.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: chrome/browser/profiles/off_the_record_profile_impl.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:

Index: chrome/browser/profiles/off_the_record_profile_impl.cc

diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc

index a363530fa39fb0dbb3b4e4ac3c4eb4f918dd8d89..02ece36cda6b7f5a3a6101eba3a705dd8204d480 100644

--- a/chrome/browser/profiles/off_the_record_profile_impl.cc

+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc

@@ -76,9 +76,9 @@

#if defined(ENABLE_EXTENSIONS)

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_special_storage_policy.h"

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

#include "extensions/browser/api/web_request/web_request_api.h"

#include "extensions/browser/extension_system.h"

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

#include "extensions/common/extension.h"

#endif

@@ -415,7 +415,7 @@ HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {

content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {

#if defined(ENABLE_EXTENSIONS)

- return extensions::GuestViewManager::FromBrowserContext(this);

+ return guest_view::GuestViewManager::FromBrowserContext(this);

#else

return NULL;

#endif