extensions/shell/browser/shell_browser_context.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/shell/browser/shell_browser_context.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: extensions/shell/browser/shell_browser_context.cc

diff --git a/extensions/shell/browser/shell_browser_context.cc b/extensions/shell/browser/shell_browser_context.cc

index 827eabee0d6b571bc0fc87fa1c71d1fc2470390c..745770b5d3b1bdeab48656514689e3d70d34af1e 100644

--- a/extensions/shell/browser/shell_browser_context.cc

+++ b/extensions/shell/browser/shell_browser_context.cc

@@ -5,9 +5,9 @@

#include "extensions/shell/browser/shell_browser_context.h"

#include "base/command_line.h"

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

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

#include "content/public/common/content_switches.h"

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

#include "extensions/shell/browser/shell_network_delegate.h"

#include "extensions/shell/browser/shell_special_storage_policy.h"

#include "extensions/shell/browser/shell_url_request_context_getter.h"

@@ -35,7 +35,7 @@ ShellBrowserContext::~ShellBrowserContext() {

}

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

- return GuestViewManager::FromBrowserContext(this);

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

}

storage::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {

« no previous file with comments | « extensions/shell/BUILD.gn ('k') | extensions/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »