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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "v8_proxy.h" 5 #include "v8_proxy.h"
6 #undef LOG 6 #undef LOG
7 7
8 #include "webkit/tools/test_shell/test_shell.h" 8 #include "webkit/tools/test_shell/test_shell.h"
9 9
10 10
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 bool IsMediaPlayerAvailable() { 567 bool IsMediaPlayerAvailable() {
568 return g_media_player_available; 568 return g_media_player_available;
569 } 569 }
570 570
571 void PrecacheUrl(const char16* url, int url_length) {} 571 void PrecacheUrl(const char16* url, int url_length) {}
572 572
573 void AppendToLog(const char* file, int line, const char* msg) { 573 void AppendToLog(const char* file, int line, const char* msg) {
574 logging::LogMessage(file, line).stream() << msg; 574 logging::LogMessage(file, line).stream() << msg;
575 } 575 }
576 576
577 #if !defined(LINUX2)
577 bool GetApplicationDirectory(std::wstring *path) { 578 bool GetApplicationDirectory(std::wstring *path) {
578 return PathService::Get(base::DIR_EXE, path); 579 return PathService::Get(base::DIR_EXE, path);
579 } 580 }
581 #endif
580 582
581 GURL GetInspectorURL() { 583 GURL GetInspectorURL() {
582 return GURL("test-shell-resource://inspector/inspector.html"); 584 return GURL("test-shell-resource://inspector/inspector.html");
583 } 585 }
584 586
585 std::string GetUIResourceProtocol() { 587 std::string GetUIResourceProtocol() {
586 return "test-shell-resource"; 588 return "test-shell-resource";
587 } 589 }
588 590
591 #if !defined(LINUX2)
589 bool GetExeDirectory(std::wstring *path) { 592 bool GetExeDirectory(std::wstring *path) {
590 return PathService::Get(base::DIR_EXE, path); 593 return PathService::Get(base::DIR_EXE, path);
591 } 594 }
595 #endif
592 596
593 bool SpellCheckWord(const wchar_t* word, int word_len, 597 bool SpellCheckWord(const wchar_t* word, int word_len,
594 int* misspelling_start, int* misspelling_len) { 598 int* misspelling_start, int* misspelling_len) {
595 // Report all words being correctly spelled. 599 // Report all words being correctly spelled.
596 *misspelling_start = 0; 600 *misspelling_start = 0;
597 *misspelling_len = 0; 601 *misspelling_len = 0;
598 return true; 602 return true;
599 } 603 }
600 604
605 #if !defined(LINUX2)
601 bool IsPluginRunningInRendererProcess() { 606 bool IsPluginRunningInRendererProcess() {
602 return true; 607 return true;
603 } 608 }
609 #endif
604 610
605 bool GetPluginFinderURL(std::string* plugin_finder_url) { 611 bool GetPluginFinderURL(std::string* plugin_finder_url) {
606 return false; 612 return false;
607 } 613 }
608 614
615 #if !defined(LINUX2)
609 bool IsDefaultPluginEnabled() { 616 bool IsDefaultPluginEnabled() {
610 return false; 617 return false;
611 } 618 }
612 619
613 std::wstring GetWebKitLocale() { 620 std::wstring GetWebKitLocale() {
614 return L"en-US"; 621 return L"en-US";
615 } 622 }
623 #endif
616 624
617 } // namespace webkit_glue 625 } // namespace webkit_glue
OLDNEW
« 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