Register O3D/GTalk PPAPI plugins if available

chrome/common/chrome_paths.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/common/chrome_paths.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 42 matching lines @@
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // File name of the nacl_helper and nacl_helper_bootstrap, Linux only.
 const FilePath::CharType kInternalNaClHelperFileName[] =
     FILE_PATH_LITERAL("nacl_helper");
 const FilePath::CharType kInternalNaClHelperBootstrapFileName[] =
     FILE_PATH_LITERAL("nacl_helper_bootstrap");
 #endif
 
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+
+#if defined(OS_CHROMEOS)
+
+const FilePath::CharType kO3DPluginFileName[] =
+    FILE_PATH_LITERAL("/opt/google/o3d/libppo3dautoplugin.so");

[piman, 2011/12/13 01:48:02]

Do we need a different path on Chrome OS vs non-Chrome OS?
Do we need the path for these plugins to be different than the other pepper
plugins?
Why not simply always install them in /opt/google/chrome/pepper with the rest,
and remove these ifdefs?

[Josh Horwich, 2011/12/13 22:06:30]

Done - I moved it to the pepper directory on all Linux flavors. I also kept it
inside of the POSIX && !MACOSX conditional so we don't waste time during startup
calling PathExists on those platforms.

+
+const FilePath::CharType kGTalkPluginFileName[] =
+    FILE_PATH_LITERAL("/opt/google/talkplugin/libppgoogletalk.so");
+
+#else  // defined(OS_CHROMEOS)
+
+// File name of the O3D and GTalk plugin, Linux only
+const FilePath::CharType kO3DPluginFileName[] =
+    FILE_PATH_LITERAL("libppo3dautoplugin.so");
+
+const FilePath::CharType kGTalkPluginFileName[] =
+    FILE_PATH_LITERAL("libppgoogletalk.so");
+
+#endif  // defined(OS_CHROMEOS)
+
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 }  // namespace
 
 namespace chrome {
 
 // Gets the path for internal plugins.
 bool GetInternalPluginsDirectory(FilePath* result) {
 #if defined(OS_MACOSX)
   // If called from Chrome, get internal plugins from a subdirectory of the
   // framework.
   if (base::mac::AmIBundled()) {
@@ skipping 173 matching lines @@
     case chrome::FILE_NACL_HELPER:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kInternalNaClHelperFileName);
       break;
     case chrome::FILE_NACL_HELPER_BOOTSTRAP:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kInternalNaClHelperBootstrapFileName);
       break;
+    case chrome::FILE_O3D_PLUGIN:
+#if defined(OS_CHROMEOS)
+      cur = FilePath(kO3DPluginFileName);
+#else  // defined(OS_CHROMEOS)
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+      cur = cur.Append(kO3DPluginFileName);
+#endif  // OS_CHROMEOS
+      break;
+    case chrome::FILE_GTALK_PLUGIN:
+#if defined(OS_CHROMEOS)
+      cur = FilePath(kGTalkPluginFileName);
+#else  // defined(OS_CHROMEOS)
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+      cur = cur.Append(kGTalkPluginFileName);
+#endif  // OS_CHROMEOS
+      break;
 #endif
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX)
       if (base::mac::AmIBundled()) {
         cur = base::mac::MainAppBundlePath();
         cur = cur.Append(FILE_PATH_LITERAL("Resources"))
                  .Append(FILE_PATH_LITERAL("resources.pak"));
         break;
       }
       // If we're not bundled on mac, resources.pak should be next to the
@@ skipping 140 matching lines @@
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace chrome