Re-enable the build of Pepper support by default (issue 464074, svn revision ...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if defined(ENABLE_PEPPER)
-#define PEPPER_APIS_ENABLED
-#endif
-
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/gfx/color_utils.h"
 #include "app/gfx/favicon_size.h"
 #include "app/gfx/native_widget_types.h"
 #include "app/l10n_util.h"
@@ skipping 2615 matching lines @@
       url, policy_url, mime_type, &path, actual_mime_type));
   if (path.value().empty())
     return NULL;
 
   const std::string* mime_type_to_use;
   if (!actual_mime_type->empty())
     mime_type_to_use = actual_mime_type;
   else
     mime_type_to_use = &mime_type;
 
-#if defined(PEPPER_APIS_ENABLED)
+  bool use_pepper_host = false;
+  bool in_process_plugin = RenderProcess::current()->in_process_plugins();
+  // Check for trusted Pepper plugins.
   const char kPepperPrefix[] = "pepper-";
   if (StartsWithASCII(*mime_type_to_use, kPepperPrefix, true)) {
-    return WebPluginDelegatePepper::Create(
-        path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
+    if (CommandLine::ForCurrentProcess()->
+            HasSwitch(switches::kInternalPepper)) {
+      in_process_plugin = true;
+      use_pepper_host = true;
+    } else {
+      // In process Pepper plugins must be explicitly enabled.
+      return NULL;
+    }
   }
-#endif
-
-  bool in_process_plugin = RenderProcess::current()->in_process_plugins();
+  // Check for Native Client modules.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) {
     if (mime_type == "application/x-nacl-srpc") {
       in_process_plugin = true;
+      use_pepper_host = true;
     }
   }
   if (in_process_plugin) {
 #if defined(OS_WIN)  // In-proc plugins aren't supported on Linux or Mac.
-    return WebPluginDelegateImpl::Create(
-        path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
+    if (use_pepper_host) {
+      return WebPluginDelegatePepper::Create(
+          path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
+    } else {
+      return WebPluginDelegateImpl::Create(
+          path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
+    }
 #else
     NOTIMPLEMENTED();
     return NULL;
 #endif
   }
 
   return new WebPluginDelegateProxy(*mime_type_to_use, AsWeakPtr());
 }
 
 void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) {
@@ skipping 1212 matching lines @@
       new PluginMsg_SignalModalDialogEvent(host_window_));
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   bool rv = Send(message);
 
   PluginChannelHost::Broadcast(
       new PluginMsg_ResetModalDialogEvent(host_window_));
 
   return rv;
 }