| 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
|
|
|