Move Mac to using renderer spellchecker.

chrome/browser/profile.h

 // 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILE_H_
 #define CHROME_BROWSER_PROFILE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
-#if defined(SPELLCHECKER_IN_RENDERER)
 #include "chrome/browser/spellcheck_host.h"
-#endif
 #include "chrome/browser/web_resource/web_resource_service.h"
 #include "chrome/common/notification_registrar.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/preferences.h"
 #endif
 
 namespace net {
 class StrictTransportSecurityState;
 class SSLConfigService;
@@ skipping 16 matching lines @@
 class ExtensionsService;
 class FaviconService;
 class HistoryService;
 class NavigationController;
 class PasswordStore;
 class PersonalDataManager;
 class PrefService;
 class ProfileSyncService;
 class SearchVersusNavigateClassifier;
 class SessionService;
-class SpellChecker;
 class SSLConfigServiceManager;
 class SSLHostState;
 class StrictTransportSecurityPersister;
 class SQLitePersistentCookieStore;
 class TabRestoreService;
 class TemplateURLFetcher;
 class TemplateURLModel;
 class ThemeProvider;
 class ThumbnailStore;
 class URLRequestContextGetter;
@@ skipping 273 matching lines @@
   // was created, rather it is the time the user started chrome and logged into
   // this profile. For the single profile case, this corresponds to the time
   // the user started chrome.
   virtual base::Time GetStartTime() const = 0;
 
   // Returns the TabRestoreService. This returns NULL when off the record.
   virtual TabRestoreService* GetTabRestoreService() = 0;
 
   virtual void ResetTabRestoreService() = 0;
 
-  // This reinitializes the spellchecker according to the current dictionary
-  // language, and enable spell check option, in the prefs.  Then a
-  // SPELLCHECKER_REINITIALIZED notification is sent on the IO thread.
-  virtual void ReinitializeSpellChecker() = 0;
-
-  // Returns the spell checker object for this profile. THIS OBJECT MUST ONLY
-  // BE USED ON THE I/O THREAD! This pointer is retrieved from the profile and
-  // sent to the I/O thread where it is actually used.
-  virtual SpellChecker* GetSpellChecker() = 0;
-
-  // Deletes the spellchecker.  This is only really useful when we need to purge
-  // memory.
-  virtual void DeleteSpellChecker() = 0;
-
-#if defined(SPELLCHECKER_IN_RENDERER)
   // May return NULL.
   virtual SpellCheckHost* GetSpellCheckHost() = 0;
 
   // If |force| is false, and the spellchecker is already initialized (or is in
   // the process of initializing), then do nothing. Otherwise clobber the
   // current spellchecker and replace it with a new one.
   virtual void ReinitializeSpellCheckHost(bool force) = 0;
-#endif
 
   // Returns the WebKitContext assigned to this profile.
   virtual WebKitContext* GetWebKitContext() = 0;
 
   // Returns the provider of desktop notifications for this profile.
   virtual DesktopNotificationService* GetDesktopNotificationService() = 0;
 
   // Marks the profile as cleanly shutdown.
   //
   // NOTE: this is invoked internally on a normal shutdown, but is public so
@@ skipping 24 matching lines @@
   static URLRequestContextGetter* default_request_context_;
 
  private:
   bool restored_last_session_;
 };
 
 class OffTheRecordProfileImpl;
 
 // The default profile implementation.
 class ProfileImpl : public Profile,
-#if defined(SPELLCHECKER_IN_RENDERER)
                     public SpellCheckHost::Observer,
-#endif
                     public NotificationObserver {
  public:
   virtual ~ProfileImpl();
 
   // Profile implementation.
   virtual ProfileId GetRuntimeId();
   virtual FilePath GetPath();
   virtual bool IsOffTheRecord();
   virtual Profile* GetOffTheRecordProfile();
   virtual void DestroyOffTheRecordProfile();
@@ skipping 38 matching lines @@
   virtual std::wstring GetName();
   virtual void SetName(const std::wstring& name);
   virtual std::wstring GetID();
   virtual void SetID(const std::wstring& id);
   virtual bool DidLastSessionExitCleanly();
   virtual BookmarkModel* GetBookmarkModel();
   virtual bool IsSameProfile(Profile* profile);
   virtual base::Time GetStartTime() const;
   virtual TabRestoreService* GetTabRestoreService();
   virtual void ResetTabRestoreService();
-  virtual void ReinitializeSpellChecker();
-  virtual SpellChecker* GetSpellChecker();
-  virtual void DeleteSpellChecker() { DeleteSpellCheckerImpl(true); }
-#if defined(SPELLCHECKER_IN_RENDERER)
   virtual SpellCheckHost* GetSpellCheckHost();
   virtual void ReinitializeSpellCheckHost(bool force);
-#endif
   virtual WebKitContext* GetWebKitContext();
   virtual DesktopNotificationService* GetDesktopNotificationService();
   virtual void MarkAsCleanShutdown();
   virtual void InitExtensions();
   virtual void InitWebResources();
   virtual ProfileSyncService* GetProfileSyncService();
   void InitSyncService();
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-#if defined(SPELLCHECKER_IN_RENDERER)
   // SpellCheckHost::Observer implementation.
   virtual void SpellCheckHostInitialized();
-#endif
 
  private:
   friend class Profile;
 
   explicit ProfileImpl(const FilePath& path);
 
   void CreateWebDataService();
   FilePath GetPrefFilePath();
 
   void CreatePasswordStore();
 
   void StopCreateSessionServiceTimer();
 
   void EnsureRequestContextCreated() {
     GetRequestContext();
   }
 
   void EnsureSessionServiceCreated() {
     GetSessionService();
   }
 
-  void NotifySpellCheckerChanged();
-  void DeleteSpellCheckerImpl(bool notify);
-
   NotificationRegistrar registrar_;
 
   FilePath path_;
   FilePath base_cache_path_;
   scoped_ptr<VisitedLinkEventListener> visited_link_event_listener_;
   scoped_ptr<VisitedLinkMaster> visited_link_master_;
   scoped_refptr<ExtensionsService> extensions_service_;
   scoped_refptr<UserScriptMaster> user_script_master_;
   scoped_refptr<ExtensionDevToolsManager> extension_devtools_manager_;
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
@@ skipping 44 matching lines @@
 
   base::OneShotTimer<ProfileImpl> create_session_service_timer_;
 
   scoped_ptr<OffTheRecordProfileImpl> off_the_record_profile_;
 
   // See GetStartTime for details.
   base::Time start_time_;
 
   scoped_refptr<TabRestoreService> tab_restore_service_;
 
-  // This can not be a scoped_refptr because we must release it on the I/O
-  // thread.
-  SpellChecker* spellchecker_;
-
-#if defined(SPELLCHECKER_IN_RENDERER)
   scoped_refptr<SpellCheckHost> spellcheck_host_;
 
   // Indicates whether |spellcheck_host_| has told us initialization is
   // finished.
   bool spellcheck_host_ready_;
-#endif
 
   // Set to true when ShutdownSessionService is invoked. If true
   // GetSessionService won't recreate the SessionService.
   bool shutdown_session_service_;
 
   // The main database tracker for this profile.
   // Should be used only on the file thread.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
 #if defined(OS_CHROMEOS)
   chromeos::Preferences chromeos_preferences_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
-// This struct is used to pass the spellchecker object through the notification
-// SPELLCHECKER_REINITIALIZED. This is used as the details for the notification
-// service.
-struct SpellcheckerReinitializedDetails {
-  scoped_refptr<SpellChecker> spellchecker;
-};
-
 #endif  // CHROME_BROWSER_PROFILE_H_