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

Unified Diff: chrome/browser/extensions/plugin_manager.cc

Issue 398273002: [NaCl] Build fix for disable_nacl=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/extensions/plugin_manager.cc
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index b018c6d1e0cbe296e8ac93592b1f3b63f6c7e213..9015197412684ee5007c502e546c4fed906e7054 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -67,6 +67,7 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
}
}
+#if !defined(DISABLE_NACL)
const NaClModuleInfo::List* nacl_modules =
Lei Zhang 2014/07/17 05:33:47 RegisterNaClModule(), UnregisterNaClModule(), Upda
tzik 2014/07/17 05:53:31 Done.
NaClModuleInfo::GetNaClModules(extension);
if (nacl_modules) {
@@ -78,6 +79,7 @@ void PluginManager::OnExtensionLoaded(content::BrowserContext* browser_context,
}
UpdatePluginListWithNaClModules();
}
+#endif
const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
if (handler && !handler->handler_url().empty()) {
@@ -122,6 +124,7 @@ void PluginManager::OnExtensionUnloaded(
}
}
+#if !defined(DISABLE_NACL)
const NaClModuleInfo::List* nacl_modules =
NaClModuleInfo::GetNaClModules(extension);
if (nacl_modules) {
@@ -133,6 +136,7 @@ void PluginManager::OnExtensionUnloaded(
}
UpdatePluginListWithNaClModules();
}
+#endif
const MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
if (handler && !handler->handler_url().empty()) {

Powered by Google App Engine
This is Rietveld 408576698