Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 56b8cb40085cd8c7f40414149d656808ce7c9d9b..cdd6e8fb26da48218306d3ccbfe39112d3d4d965 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -85,6 +85,7 @@ |
#include "components/domain_reliability/monitor.h" |
#include "components/domain_reliability/service.h" |
#include "components/gcm_driver/gcm_profile_service.h" |
+#include "components/guest_view/browser/guest_view_manager.h" |
#include "components/keyed_service/content/browser_context_dependency_manager.h" |
#include "components/metrics/metrics_service.h" |
#include "components/omnibox/browser/autocomplete_classifier.h" |
@@ -143,7 +144,6 @@ |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/extension_special_storage_policy.h" |
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
-#include "components/guest_view/browser/guest_view_manager.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" |
@@ -989,11 +989,7 @@ net::SSLConfigService* ProfileImpl::GetSSLConfigService() { |
} |
content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { |
-#if defined(ENABLE_EXTENSIONS) |
return guest_view::GuestViewManager::FromBrowserContext(this); |
-#else |
- return NULL; |
-#endif |
} |
DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { |