Move Mac to using renderer spellchecker.

chrome/renderer/render_thread.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_thread.h"
 
 #include <v8.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 35 matching lines @@
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_extension.h"
 #include "chrome/renderer/loadtimes_extension_bindings.h"
 #include "chrome/renderer/net/render_dns_master.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_webkitclient_impl.h"
 #include "chrome/renderer/renderer_web_database_observer.h"
 #include "chrome/renderer/socket_stream_dispatcher.h"
-#if defined(SPELLCHECKER_IN_RENDERER)
 #include "chrome/renderer/spellchecker/spellcheck.h"
-#endif
 #include "chrome/renderer/user_script_slave.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebColor.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFontCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
@@ skipping 82 matching lines @@
   visited_link_slave_.reset(new VisitedLinkSlave());
   user_script_slave_.reset(new UserScriptSlave());
   dns_master_.reset(new RenderDnsMaster());
   histogram_snapshots_.reset(new RendererHistogramSnapshots());
   appcache_dispatcher_.reset(new AppCacheDispatcher(this));
   socket_stream_dispatcher_.reset(new SocketStreamDispatcher());
   devtools_agent_filter_ = new DevToolsAgentFilter();
   AddFilter(devtools_agent_filter_.get());
   db_message_filter_ = new DBMessageFilter();
   AddFilter(db_message_filter_.get());
-#if defined(SPELLCHECKER_IN_RENDERER)
   spellchecker_.reset(new SpellCheck());
-#endif
 
 #if defined(OS_POSIX)
   suicide_on_channel_error_filter_ = new SuicideOnChannelErrorFilter;
   AddFilter(suicide_on_channel_error_filter_.get());
 #endif
 }
 
 RenderThread::~RenderThread() {
   // Shutdown in reverse of the initialization order.
   RemoveFilter(devtools_agent_filter_.get());
@@ skipping 160 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_Extension_SetHostPermissions,
                         OnExtensionSetHostPermissions)
     IPC_MESSAGE_HANDLER(ViewMsg_DOMStorageEvent,
                         OnDOMStorageEvent)
     IPC_MESSAGE_HANDLER(ViewMsg_Extension_SetL10nMessages,
                         OnExtensionSetL10nMessages)
 #if defined(IPC_MESSAGE_LOG_ENABLED)
     IPC_MESSAGE_HANDLER(ViewMsg_SetIPCLoggingEnabled,
                         OnSetIPCLoggingEnabled)
 #endif
-#if defined(SPELLCHECKER_IN_RENDERER)
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_Init,
                         OnInitSpellChecker)
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_WordAdded,
                         OnSpellCheckWordAdded)
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_EnableAutoSpellCorrect,
                         OnSpellCheckEnableAutoSpellCorrect)
-#endif
   IPC_END_MESSAGE_MAP()
 }
 
 void RenderThread::OnSetNextPageID(int32 next_page_id) {
   // This should only be called at process initialization time, so we shouldn't
   // have to worry about thread-safety.
   RenderView::SetNextPageID(next_page_id);
 }
 
 // Called when to register CSS Color name->system color mappings.
@@ skipping 86 matching lines @@
 }
 
 void RenderThread::CloseIdleConnections() {
   Send(new ViewHostMsg_CloseIdleConnections());
 }
 
 void RenderThread::SetCacheMode(bool enabled) {
   Send(new ViewHostMsg_SetCacheMode(enabled));
 }
 
-#if defined(SPELLCHECKER_IN_RENDERER)
-void RenderThread::RequestSpellCheckDictionary() {
-  Send(new ViewHostMsg_SpellChecker_RequestDictionary);
-}
-#endif
-
 static void* CreateHistogram(
     const char *name, int min, int max, size_t buckets) {
   Histogram* histogram = new Histogram(name, min, max, buckets);
   if (histogram) {
     histogram->SetFlags(kUmaTargetedHistogramFlag);
   }
   return histogram;
 }
 
 static void AddHistogramSample(void* hist, int sample) {
@@ skipping 133 matching lines @@
       task_factory_->NewRunnableMethod(&RenderThread::IdleHandler),
       static_cast<int64>(floor(idle_notification_delay_in_s_)) * 1000);
 }
 
 void RenderThread::OnExtensionMessageInvoke(const std::string& function_name,
                                             const ListValue& args) {
   RendererExtensionBindings::Invoke(function_name, args, NULL);
 }
 
 void RenderThread::OnPurgeMemory() {
-#if defined(SPELLCHECKER_IN_RENDERER)
   spellchecker_.reset(new SpellCheck());
-#endif
 
   EnsureWebKitInitialized();
 
   // Clear the object cache (as much as possible; some live objects cannot be
   // freed).
   WebCache::clear();
 
   // Clear the font/glyph cache.
   WebFontCache::clear();
 
@@ skipping 22 matching lines @@
   EnsureWebKitInitialized();
   // The call below will cause a GetPlugins call with refresh=true, but at this
   // point we already know that the browser has refreshed its list, so disable
   // refresh temporarily to prevent each renderer process causing the list to be
   // regenerated.
   plugin_refresh_allowed_ = false;
   WebKit::resetPluginCache(reload_pages);
   plugin_refresh_allowed_ = true;
 }
 
-#if defined(SPELLCHECKER_IN_RENDERER)
 void RenderThread::OnInitSpellChecker(
     IPC::PlatformFileForTransit bdict_file,
     const std::vector<std::string>& custom_words,
     const std::string& language,
     bool auto_spell_correct) {
   spellchecker_->Init(IPC::PlatformFileForTransitToPlatformFile(bdict_file),
                       custom_words, language);
   spellchecker_->EnableAutoSpellCorrect(auto_spell_correct);
 }
 
 void RenderThread::OnSpellCheckWordAdded(const std::string& word) {
   spellchecker_->WordAdded(word);
 }
 
 void RenderThread::OnSpellCheckEnableAutoSpellCorrect(bool enable) {
   spellchecker_->EnableAutoSpellCorrect(enable);
 }
-#endif