diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 19:08:39 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 19:08:39 +0000 |
| commit | c2c998ce396ec7fd77d8e1277afb3f029f859341 (patch) | |
| tree | 493fc8e08610c67c72ce2df6d0f1ddefcf53974d /chrome/browser/renderer_host | |
| parent | bd05da2be472b05c290261fbf99a4a3673982a7f (diff) | |
| download | chromium_src-c2c998ce396ec7fd77d8e1277afb3f029f859341.zip chromium_src-c2c998ce396ec7fd77d8e1277afb3f029f859341.tar.gz chromium_src-c2c998ce396ec7fd77d8e1277afb3f029f859341.tar.bz2 | |
Roll forward 8722,8721
Review URL: http://codereview.chromium.org/19028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 823a063..c8b8e6e 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -27,12 +27,22 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/extensions/user_script_master.h" +#if defined(OS_WIN) #include "chrome/browser/history/history.h" +#else +// TODO(port): remove scaffolding, use history.h for both POSIX and WIN. +#include "chrome/common/temp_scaffolding_stubs.h" +#endif // !defined(OS_WIN) + #include "chrome/browser/plugin_service.h" #include "chrome/browser/renderer_host/render_widget_helper.h" #include "chrome/browser/renderer_host/renderer_security_policy.h" #include "chrome/browser/resource_message_filter.h" +#if defined(OS_MACOSX) +// TODO(port): Enable when we finish porting spellchecker to os x. +#else #include "chrome/browser/spellchecker.h" +#endif // !defined(OS_WIN) #include "chrome/browser/visitedlink_master.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -470,11 +480,17 @@ void BrowserRenderProcessHost::WidgetHidden() { } void BrowserRenderProcessHost::AddWord(const std::wstring& word) { +#if defined(OS_MACOSX) + // TODO(port): reimplement when we get the spell checker up and running on + // OS X. + NOTIMPLEMENTED(); +#else base::Thread* io_thread = g_browser_process->io_thread(); if (profile()->GetSpellChecker()) { io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod( profile()->GetSpellChecker(), &SpellChecker::AddWord, word)); } +#endif // !defined(OS_MACOSX) } base::ProcessHandle BrowserRenderProcessHost::GetRendererProcessHandle() { |