Integrating Mac OS Grammar checker into Chromium.

chrome/renderer/render_view.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "base/id_map.h"
 #include "base/linked_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer.h"
 #include "base/weak_ptr.h"
 #include "build/build_config.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/edit_command.h"
 #include "chrome/common/navigation_gesture.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
@@ skipping 381 matching lines @@
   virtual void didChangeLoadProgress(WebKit::WebFrame* frame,
                                      double load_progress);
   virtual bool isSmartInsertDeleteEnabled();
   virtual bool isSelectTrailingWhitespaceEnabled();
   virtual void didChangeSelection(bool is_selection_empty);
   virtual void didExecuteCommand(const WebKit::WebString& command_name);
   virtual bool handleCurrentKeyboardEvent();
   virtual void spellCheck(const WebKit::WebString& text,
                           int& offset,
                           int& length);
+  virtual void requestCheckingOfText(
+      const WebKit::WebString& text,
+      WebKit::WebTextCheckingCompletion* completion);
   virtual WebKit::WebString autoCorrectWord(
       const WebKit::WebString& misspelled_word);
   virtual void showSpellingUI(bool show);
   virtual bool isShowingSpellingUI();
   virtual void updateSpellingUIWithMisspelledWord(
       const WebKit::WebString& word);
   virtual void continuousSpellCheckingEnabledStateChanged();
   virtual bool runFileChooser(
       const WebKit::WebFileChooserParams& params,
       WebKit::WebFileChooserCompletion* chooser_completion);
@@ skipping 38 matching lines @@
       WebKit::WebSpeechInputListener* listener);
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
   virtual void zoomLimitsChanged(double minimum_level, double maximum_level);
   virtual void zoomLevelChanged();
 
   // WebKit::WebFrameClient implementation -------------------------------------
 
   virtual WebKit::WebPlugin* createPlugin(
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params);
-  virtual WebKit::WebWorker* createWorker(WebKit::WebFrame* frame,
-                                          WebKit::WebWorkerClient* client);
+  virtual WebKit::WebWorker* createWorker(
+      WebKit::WebFrame* frame,
+      WebKit::WebWorkerClient* client);

[Hironori Bono, 2011/02/09 05:43:51]

nit: is this change needed by your change?

[gmorrita, 2011/02/10 02:15:21]

Hmm. Something wrong happened. Recovered original.

   virtual WebKit::WebSharedWorker* createSharedWorker(
       WebKit::WebFrame* frame, const WebKit::WebURL& url,
       const WebKit::WebString& name, unsigned long long documentId);
   virtual WebKit::WebMediaPlayer* createMediaPlayer(
       WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client);
   virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost(
       WebKit::WebFrame* frame,
       WebKit::WebApplicationCacheHostClient* client);
   virtual WebKit::WebCookieJar* cookieJar(WebKit::WebFrame* frame);
@@ skipping 197 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnHandleKeyboardEvent);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, InsertCharacters);
 #if defined(OS_MACOSX)
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp);
 #endif
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, JSBlockSentAfterPageLoad);
   FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL);
 
   typedef std::map<GURL, ContentSettings> HostContentSettings;
   typedef std::map<GURL, double> HostZoomLevels;
+  typedef IDMap<WebKit::WebTextCheckingCompletion> TextCheckCompletions;
 
   // Cannot use std::set unfortunately since linked_ptr<> does not support
   // operator<.
   typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> >
       ImageResourceFetcherList;
 
   // Identifies an accessibility notification from webkit.
   struct RendererAccessibilityNotification {
    public:
     bool ShouldIncludeChildren();
@@ skipping 221 matching lines @@
   void OnSetWindowVisibility(bool visible);
 #endif
   void OnSetZoomLevel(double zoom_level);
   void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level);
   void OnShouldClose();
   void OnStop();
   void OnStopFinding(const ViewMsg_StopFinding_Params& params);
   void OnThemeChanged();
   void OnToggleSpellCheck();
   void OnToggleSpellPanel(bool is_currently_visible);
+  void OnRespondTextCheck(int identifier, int tag,
+                          const TextCheckingResultList& results);
+  void OnTranslatePage(int page_id,

[Hironori Bono, 2011/02/09 05:43:51]

nit: is this function needed by your change?

[gmorrita, 2011/02/10 02:15:21]

No... thank you for pointing this out. Removed.
Something wrong happened on updating the patch.

+                       const std::string& translate_script,
+                       const std::string& source_lang,
+                       const std::string& target_lang);
+
   void OnUndo();
   void OnUpdateBrowserWindowId(int window_id);
   void OnUpdateTargetURLAck();
   void OnUpdateWebPreferences(const WebPreferences& prefs);
 #if defined(OS_MACOSX)
   void OnWindowFrameChanged(const gfx::Rect& window_frame,
                             const gfx::Rect& view_frame);
   void OnSelectPopupMenuItem(int selected_index);
 #endif
   void OnZoom(PageZoom::Function function);
@@ skipping 500 matching lines @@
   // The node that the context menu was pressed over.
   WebKit::WebNode context_menu_node_;
 
   // Reports load progress to the browser.
   scoped_ptr<LoadProgressTracker> load_progress_tracker_;
 
   // All the registered observers.  We expect this list to be small, so vector
   // is fine.
   ObserverList<RenderViewObserver> observers_;
 
+  // Holding ongoing spellchecking operations, assigning IDs

[Hironori Bono, 2011/02/09 05:43:51]

nit: "holding" -> "holds", "assigning" -> "assigns". a variable comment should
be descriptive, i.e. the subject of a variable comment should be the variable
itself.
<http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Variab...>

[gmorrita, 2011/02/10 02:15:21]

Thanks for the clarification. Fixed.

+  // for the IPC routing.
+  TextCheckCompletions text_check_completions_;
+
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can use
   // the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_