Register O3D/GTalk PPAPI plugins if available

chrome/common/chrome_paths.cc

Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 5af2ce3be302433a3e1bca160fdfbc7c0d598fd6..0ad687c59473a3413979f92d6a81084d3f63eee1 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -60,6 +60,29 @@ 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 {
@@ -253,6 +276,24 @@ bool PathProvider(int key, FilePath* result) {
         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)