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

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

Issue 437503004: Add NaCl support to app_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (nacl-init) rebase 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
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/plugin_manager.cc
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index 86bbe93ca3550ddcf984ed3515a370d6be9a6b50..8d979f2fa8a1ca99c06a91375a3622cf58f7e7bc 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -19,12 +19,12 @@
#include "extensions/common/extension.h"
#include "url/gurl.h"
-using content::PluginService;
-
#if !defined(DISABLE_NACL)
-static const char kNaClPluginMimeType[] = "application/x-nacl";
+#include "components/nacl/common/nacl_constants.h"
#endif
+using content::PluginService;
+
namespace extensions {
PluginManager::PluginManager(content::BrowserContext* context)
@@ -184,7 +184,7 @@ void PluginManager::UpdatePluginListWithNaClModules() {
// Check each MIME type the plugins handle for the NaCl MIME type.
for (mime_iter = pepper_info->mime_types.begin();
mime_iter != pepper_info->mime_types.end(); ++mime_iter) {
- if (mime_iter->mime_type == kNaClPluginMimeType) {
+ if (mime_iter->mime_type == nacl::kNaClPluginMimeType) {
// This plugin handles "application/x-nacl".
PluginService::GetInstance()->UnregisterInternalPlugin(pepper_info->path);
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698