chrome/browser/profiles/profile_impl.cc - Issue 464533002: Move guest_view to extensions.

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/profile_impl.cc

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 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/profile_impl.cc

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

index bd6fa639f1b53acd868d2e6f67858967bb050fc0..557912c456ca5e219b09193bed6709e443dfd9cc 100644

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

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

@@ -138,12 +138,12 @@

#if defined(ENABLE_EXTENSIONS)

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

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

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

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

#include "extensions/browser/extension_pref_store.h"

#include "extensions/browser/extension_pref_value_map.h"

#include "extensions/browser/extension_pref_value_map_factory.h"

#include "extensions/browser/extension_system.h"

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

#endif

#if defined(ENABLE_MANAGED_USERS)

@@ -1089,7 +1089,7 @@ HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {

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

#if defined(ENABLE_EXTENSIONS)

- return GuestViewManager::FromBrowserContext(this);

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

#else

return NULL;

#endif