Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc

Issue 468913006: Added extension macro checks for android plugin files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
index 78521326ff8e711ef2cc0b97b8c9e6bb7267ccfd..f2d83fec5b01749ae5e235375dd4647265819711 100644
--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
@@ -98,6 +98,7 @@ Profile* PepperIsolatedFileSystemMessageFilter::GetProfile() {
std::string PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(
Profile* profile) {
+#if defined(ENABLE_EXTENSIONS)
extensions::ExtensionSystem* extension_system =
extensions::ExtensionSystem::Get(profile);
if (!extension_system)
@@ -120,6 +121,9 @@ std::string PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(
std::string(),
extension->path(),
&kFirstLevelDirectory);
+#else
+ return std::string();
+#endif
}
int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
@@ -141,6 +145,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem(
int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
ppapi::host::HostMessageContext* context) {
+#if defined(ENABLE_EXTENSIONS)
Profile* profile = GetProfile();
const extensions::ExtensionSet* extension_set = NULL;
if (profile) {
@@ -173,6 +178,9 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem(
context->reply_msg = PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply(fsid);
return PP_OK;
+#else
+ return PP_ERROR_NOTSUPPORTED;
+#endif
}
int32_t PepperIsolatedFileSystemMessageFilter::OpenPluginPrivateFileSystem(

Powered by Google App Engine
This is Rietveld 408576698