diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 19:56:16 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 19:56:16 +0000 |
| commit | ea81ac968e926f50d62f24494479e8c12741d84d (patch) | |
| tree | cf4e13e11ef443b1de4e8a67fae22cb220a2bd05 | |
| parent | 278ab6a5d853262e56cf604f568da3ddecc26791 (diff) | |
| download | chromium_src-ea81ac968e926f50d62f24494479e8c12741d84d.zip chromium_src-ea81ac968e926f50d62f24494479e8c12741d84d.tar.gz chromium_src-ea81ac968e926f50d62f24494479e8c12741d84d.tar.bz2 | |
Get shared link working again.
1) The spell checker works, but it was still in temp_scaffolding_stubs.
This meant different files had a different view of the class, causing
memory corruption on startup. (Valgrind caught this. We need a Valgrind
builder!)
2) The net library provides gtest-related bits and must depend on gtest.
Review URL: http://codereview.chromium.org/27036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10280 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 4 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 8 | ||||
| -rw-r--r-- | chrome/test/perf/perftests.scons | 4 | ||||
| -rw-r--r-- | net/net_lib.scons | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index 39cafaa..5ee46e0 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -21,6 +21,7 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/debugger/debugger_shell.h" +#include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/download/download_request_dialog_delegate.h" #include "chrome/browser/download/download_request_manager.h" #include "chrome/browser/first_run.h" @@ -467,3 +468,6 @@ DownloadRequestDialogDelegate* DownloadRequestDialogDelegate::Create( return NULL; } +DOMMessageHandler::~DOMMessageHandler() { + NOTIMPLEMENTED(); +} diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 5179ffa..987c25c 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -494,6 +494,11 @@ class Encryptor { } }; + +// spellchecker.h works on Linux, but it depends on hunspell which isn't +// built on Mac. Getting it to build on the Mac is apparently hard, so I'll +// punt this to the Mac team for now. +#if defined(OS_MACOSX) class SpellChecker : public base::RefCountedThreadSafe<SpellChecker> { public: typedef std::wstring Language; @@ -518,6 +523,9 @@ class SpellChecker : public base::RefCountedThreadSafe<SpellChecker> { return 0; } }; +#else +#include "chrome/browser/spellchecker.h" +#endif class WebAppLauncher { public: diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons index 890ed72..a0eadcf 100644 --- a/chrome/test/perf/perftests.scons +++ b/chrome/test/perf/perftests.scons @@ -29,6 +29,10 @@ env.ApplySConscript([ '$SDCH_DIR/using_sdch.scons', '$SKIA_DIR/using_skia.scons', '$ZLIB_DIR/using_zlib.scons', + + # TODO(port): we should have a using_browser.scons that pulls in hunspell + # for itself. + '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', ]) env.Prepend( diff --git a/net/net_lib.scons b/net/net_lib.scons index fda0cc7..9d0acbb 100644 --- a/net/net_lib.scons +++ b/net/net_lib.scons @@ -14,6 +14,7 @@ env.ApplySConscript([ '$BZIP2_DIR/using_bzip2.scons', '$CHROME_SRC_DIR/build/using_googleurl.scons', '$GRIT_DIR/build/using_generated_resources.scons', + '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', '$MODP_B64_DIR/using_modp_b64.scons', '$SDCH_DIR/using_sdch.scons', |