chrome/browser/profiles/off_the_record_profile_impl.cc - Issue 661053002: Cleanup: Put more media and profile extensions code behind ENABLE_EXTENSIONS ifdefs.

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 661053002: Cleanup: Put more media and profile extensions code behind ENABLE_EXTENSIONS ifdefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: nits Created 6 years, 2 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

« no previous file with comments | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1e30d3370b7d73e63334a2d818ca4bc49810b7d0..4a0937e1d9fb3f576e2549f385e7149e95cb6816 100644

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

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

@@ -21,7 +21,6 @@

#include "chrome/browser/download/chrome_download_manager_delegate.h"

#include "chrome/browser/download/download_service.h"

#include "chrome/browser/download/download_service_factory.h"

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

#include "chrome/browser/io_thread.h"

#include "chrome/browser/net/chrome_url_request_context_getter.h"

#include "chrome/browser/net/pref_proxy_config_tracker.h"

@@ -72,6 +71,7 @@

#if defined(ENABLE_EXTENSIONS)

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

+#include "chrome/browser/extensions/extension_special_storage_policy.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"

@@ -382,7 +382,11 @@ content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {

storage::SpecialStoragePolicy*

OffTheRecordProfileImpl::GetSpecialStoragePolicy() {

+#if defined(ENABLE_EXTENSIONS)

return GetExtensionSpecialStoragePolicy();

+#else

+ return NULL;

+#endif

}

content::PushMessagingService*