diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 20:40:48 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 20:40:48 +0000 |
| commit | f7f181f5b4b4cfa8d4882cccb3e349458084dbf6 (patch) | |
| tree | fcb7074b4d754ae1f83fc6d2da42954662cb611f /chrome/common/common_glue.cc | |
| parent | 94f957511b1a940454516a43acb730350fc6cad8 (diff) | |
| download | chromium_src-f7f181f5b4b4cfa8d4882cccb3e349458084dbf6.zip chromium_src-f7f181f5b4b4cfa8d4882cccb3e349458084dbf6.tar.gz chromium_src-f7f181f5b4b4cfa8d4882cccb3e349458084dbf6.tar.bz2 | |
Fix our link madness on linux. We now properly link
webkit into unit_tests.
There was also a problem with simple_clipboard_impl.cc which should only be
compiled into test_shell.
I can't remove mock_webkit_glue.cc until I verify that the mac build doesn't
need it anymore.
Review URL: http://codereview.chromium.org/19474
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/common_glue.cc')
| -rw-r--r-- | chrome/common/common_glue.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc index 7d32310..0e173f80 100644 --- a/chrome/common/common_glue.cc +++ b/chrome/common/common_glue.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/path_service.h" +#include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/l10n_util.h" @@ -22,7 +23,13 @@ bool GetApplicationDirectory(std::wstring *path) { } bool IsPluginRunningInRendererProcess() { +#if defined(OS_WIN) return !IsPluginProcess(); +#else + // TODO(port): We need an implementation of IsPluginProcess. + NOTIMPLEMENTED(); + return false; +#endif } std::wstring GetWebKitLocale() { |