summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 15:09:39 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 15:09:39 +0000
commit9146221ca83c4996713894316661b442b20c9e28 (patch)
tree0cd1efb863d39a4ac44aacde045c957552e3da7d /webkit/tools/test_shell/test_shell.cc
parent98f5f88b53f774cee109503b0225a5bfb9deb550 (diff)
downloadchromium_src-9146221ca83c4996713894316661b442b20c9e28.zip
chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.gz
chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.bz2
Adds some ifdefs so that test_shell can be compiled on linux
without GTK. I had to recreate this patch as my workspace for various resonds. UGH! BUG=none TEST=none Review URL: http://codereview.chromium.org/67024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.cc')
-rwxr-xr-xwebkit/tools/test_shell/test_shell.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index df8b087..6ce2509 100755
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -574,9 +574,11 @@ void AppendToLog(const char* file, int line, const char* msg) {
logging::LogMessage(file, line).stream() << msg;
}
+#if !defined(LINUX2)
bool GetApplicationDirectory(std::wstring *path) {
return PathService::Get(base::DIR_EXE, path);
}
+#endif
GURL GetInspectorURL() {
return GURL("test-shell-resource://inspector/inspector.html");
@@ -586,9 +588,11 @@ std::string GetUIResourceProtocol() {
return "test-shell-resource";
}
+#if !defined(LINUX2)
bool GetExeDirectory(std::wstring *path) {
return PathService::Get(base::DIR_EXE, path);
}
+#endif
bool SpellCheckWord(const wchar_t* word, int word_len,
int* misspelling_start, int* misspelling_len) {
@@ -598,14 +602,17 @@ bool SpellCheckWord(const wchar_t* word, int word_len,
return true;
}
+#if !defined(LINUX2)
bool IsPluginRunningInRendererProcess() {
return true;
}
+#endif
bool GetPluginFinderURL(std::string* plugin_finder_url) {
return false;
}
+#if !defined(LINUX2)
bool IsDefaultPluginEnabled() {
return false;
}
@@ -613,5 +620,6 @@ bool IsDefaultPluginEnabled() {
std::wstring GetWebKitLocale() {
return L"en-US";
}
+#endif
} // namespace webkit_glue