summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-26 23:07:08 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-26 23:07:08 +0000
commitbe673285c995f542cab399a608357d34c4c22fa0 (patch)
tree8c361227f8e8bd481cc40cf7b1aa11bbd95a85a2 /chrome/common/chrome_paths.cc
parentb9fadcecd99459d101be36a17b2607e0595f23e4 (diff)
downloadchromium_src-be673285c995f542cab399a608357d34c4c22fa0.zip
chromium_src-be673285c995f542cab399a608357d34c4c22fa0.tar.gz
chromium_src-be673285c995f542cab399a608357d34c4c22fa0.tar.bz2
No gears.dll on non-Windows systems.
Review URL: http://codereview.chromium.org/42669 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
-rw-r--r--chrome/common/chrome_paths.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 3c4aa86..81b5ab8 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -140,6 +140,7 @@ bool PathProvider(int key, FilePath* result) {
break;
case chrome::FILE_GEARS_PLUGIN:
if (!GetGearsPluginPathFromCommandLine(&cur)) {
+#if defined(OS_WIN)
// Search for gears.dll alongside chrome.dll first. This new model
// allows us to package gears.dll with the Chrome installer and update
// it while Chrome is running.
@@ -154,6 +155,10 @@ bool PathProvider(int key, FilePath* result) {
cur = cur.Append(FILE_PATH_LITERAL("gears"));
cur = cur.Append(FILE_PATH_LITERAL("gears.dll"));
}
+#else
+ // No gears.dll on non-Windows systems.
+ return false;
+#endif
}
break;
case chrome::FILE_LIBAVCODEC: