Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: webkit/tools/test_shell/test_shell.cc

Issue 67024: Adds some ifdefs so that test_shell can be compiled on linux... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webplugin_impl.cc ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.cc
===================================================================
--- webkit/tools/test_shell/test_shell.cc (revision 13475)
+++ webkit/tools/test_shell/test_shell.cc (working copy)
@@ -574,9 +574,11 @@
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 @@
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 @@
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 @@
std::wstring GetWebKitLocale() {
return L"en-US";
}
+#endif
} // namespace webkit_glue
« no previous file with comments | « webkit/glue/webplugin_impl.cc ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698