Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: chrome/renderer/render_view.cc

Issue 6392045: Integrating Mac OS Grammar checker into Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated to ToT Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/render_view.h ('k') | chrome/renderer/render_view_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "chrome/renderer/render_view_observer.h" 84 #include "chrome/renderer/render_view_observer.h"
85 #include "chrome/renderer/render_view_visitor.h" 85 #include "chrome/renderer/render_view_visitor.h"
86 #include "chrome/renderer/render_widget_fullscreen.h" 86 #include "chrome/renderer/render_widget_fullscreen.h"
87 #include "chrome/renderer/render_widget_fullscreen_pepper.h" 87 #include "chrome/renderer/render_widget_fullscreen_pepper.h"
88 #include "chrome/renderer/renderer_webapplicationcachehost_impl.h" 88 #include "chrome/renderer/renderer_webapplicationcachehost_impl.h"
89 #include "chrome/renderer/renderer_webstoragenamespace_impl.h" 89 #include "chrome/renderer/renderer_webstoragenamespace_impl.h"
90 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 90 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
91 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 91 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
92 #include "chrome/renderer/searchbox.h" 92 #include "chrome/renderer/searchbox.h"
93 #include "chrome/renderer/speech_input_dispatcher.h" 93 #include "chrome/renderer/speech_input_dispatcher.h"
94 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
94 #include "chrome/renderer/spellchecker/spellcheck.h" 95 #include "chrome/renderer/spellchecker/spellcheck.h"
95 #include "chrome/renderer/translate_helper.h" 96 #include "chrome/renderer/translate_helper.h"
96 #include "chrome/renderer/user_script_idle_scheduler.h" 97 #include "chrome/renderer/user_script_idle_scheduler.h"
97 #include "chrome/renderer/user_script_slave.h" 98 #include "chrome/renderer/user_script_slave.h"
98 #include "chrome/renderer/visitedlink_slave.h" 99 #include "chrome/renderer/visitedlink_slave.h"
99 #include "chrome/renderer/web_ui_bindings.h" 100 #include "chrome/renderer/web_ui_bindings.h"
100 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h" 101 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
101 #include "chrome/renderer/webplugin_delegate_pepper.h" 102 #include "chrome/renderer/webplugin_delegate_pepper.h"
102 #include "chrome/renderer/webplugin_delegate_proxy.h" 103 #include "chrome/renderer/webplugin_delegate_proxy.h"
103 #include "chrome/renderer/websharedworker_proxy.h" 104 #include "chrome/renderer/websharedworker_proxy.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" 144 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
144 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" 145 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
145 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" 146 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
146 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" 147 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
147 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData .h" 148 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData .h"
148 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" 149 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
149 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" 150 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
150 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" 151 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
151 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h " 152 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h "
152 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" 153 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
154 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingComple tion.h"
155 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingResult .h"
153 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" 156 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
154 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" 157 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
155 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" 158 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
156 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" 159 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
157 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" 160 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
158 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 161 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
159 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" 162 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
160 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" 163 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
161 #include "third_party/skia/include/core/SkBitmap.h" 164 #include "third_party/skia/include/core/SkBitmap.h"
162 #include "ui/base/message_box_flags.h" 165 #include "ui/base/message_box_flags.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 using WebKit::WebRect; 259 using WebKit::WebRect;
257 using WebKit::WebScriptSource; 260 using WebKit::WebScriptSource;
258 using WebKit::WebSearchableFormData; 261 using WebKit::WebSearchableFormData;
259 using WebKit::WebSecurityOrigin; 262 using WebKit::WebSecurityOrigin;
260 using WebKit::WebSettings; 263 using WebKit::WebSettings;
261 using WebKit::WebSharedWorker; 264 using WebKit::WebSharedWorker;
262 using WebKit::WebSize; 265 using WebKit::WebSize;
263 using WebKit::WebStorageNamespace; 266 using WebKit::WebStorageNamespace;
264 using WebKit::WebString; 267 using WebKit::WebString;
265 using WebKit::WebTextAffinity; 268 using WebKit::WebTextAffinity;
269 using WebKit::WebTextCheckingResult;
266 using WebKit::WebTextDirection; 270 using WebKit::WebTextDirection;
267 using WebKit::WebURL; 271 using WebKit::WebURL;
268 using WebKit::WebURLError; 272 using WebKit::WebURLError;
269 using WebKit::WebURLRequest; 273 using WebKit::WebURLRequest;
270 using WebKit::WebURLResponse; 274 using WebKit::WebURLResponse;
271 using WebKit::WebVector; 275 using WebKit::WebVector;
272 using WebKit::WebView; 276 using WebKit::WebView;
273 using WebKit::WebWidget; 277 using WebKit::WebWidget;
274 using WebKit::WebWindowFeatures; 278 using WebKit::WebWindowFeatures;
275 using WebKit::WebWorker; 279 using WebKit::WebWorker;
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)), 578 ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)),
575 ALLOW_THIS_IN_INITIALIZER_LIST(page_info_method_factory_(this)), 579 ALLOW_THIS_IN_INITIALIZER_LIST(page_info_method_factory_(this)),
576 ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)), 580 ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)),
577 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)), 581 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
578 devtools_client_(NULL), 582 devtools_client_(NULL),
579 geolocation_dispatcher_(NULL), 583 geolocation_dispatcher_(NULL),
580 speech_input_dispatcher_(NULL), 584 speech_input_dispatcher_(NULL),
581 device_orientation_dispatcher_(NULL), 585 device_orientation_dispatcher_(NULL),
582 print_helper_(NULL), 586 print_helper_(NULL),
583 searchbox_(NULL), 587 searchbox_(NULL),
588 spellcheck_provider_(NULL),
584 accessibility_ack_pending_(false), 589 accessibility_ack_pending_(false),
585 pending_app_icon_requests_(0), 590 pending_app_icon_requests_(0),
586 session_storage_namespace_id_(session_storage_namespace_id) { 591 session_storage_namespace_id_(session_storage_namespace_id) {
587 #if defined(OS_MACOSX) 592 #if defined(OS_MACOSX)
588 // On Mac, the select popups are rendered by the browser. 593 // On Mac, the select popups are rendered by the browser.
589 // Note that we don't do this in RenderMain otherwise this would not be called 594 // Note that we don't do this in RenderMain otherwise this would not be called
590 // in single-process mode. 595 // in single-process mode.
591 WebKit::WebView::setUseExternalPopupMenus(true); 596 WebKit::WebView::setUseExternalPopupMenus(true);
592 #endif 597 #endif
593 598
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 PageClickTracker* page_click_tracker = new PageClickTracker(this); 654 PageClickTracker* page_click_tracker = new PageClickTracker(this);
650 // Note that the order of insertion of the listeners is important. 655 // Note that the order of insertion of the listeners is important.
651 // The password_autocomplete_manager takes the first shot at processing the 656 // The password_autocomplete_manager takes the first shot at processing the
652 // notification and can stop the propagation. 657 // notification and can stop the propagation.
653 page_click_tracker->AddListener(password_autofill_manager); 658 page_click_tracker->AddListener(password_autofill_manager);
654 page_click_tracker->AddListener(autofill_agent); 659 page_click_tracker->AddListener(autofill_agent);
655 new TranslateHelper(this); 660 new TranslateHelper(this);
656 print_helper_ = new PrintWebViewHelper(this); 661 print_helper_ = new PrintWebViewHelper(this);
657 searchbox_ = new SearchBox(this); 662 searchbox_ = new SearchBox(this);
658 663
664 RenderThread* current_thread = RenderThread::current();
665 SpellCheck* spellcheck = current_thread ? current_thread->spellchecker() : 0;
666 spellcheck_provider_ = new SpellCheckProvider(this, spellcheck);
667
659 if (CommandLine::ForCurrentProcess()->HasSwitch( 668 if (CommandLine::ForCurrentProcess()->HasSwitch(
660 switches::kEnableClientSidePhishingDetection)) { 669 switches::kEnableClientSidePhishingDetection)) {
661 new safe_browsing::PhishingClassifierDelegate(this, NULL); 670 new safe_browsing::PhishingClassifierDelegate(this, NULL);
662 } 671 }
663 672
664 // Observer for Malware DOM details messages. 673 // Observer for Malware DOM details messages.
665 new safe_browsing::MalwareDOMDetails(this); 674 new safe_browsing::MalwareDOMDetails(this);
666 } 675 }
667 676
668 RenderView::~RenderView() { 677 RenderView::~RenderView() {
(...skipping 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after
2293 string16 word(text); 2302 string16 word(text);
2294 RenderThread* thread = RenderThread::current(); 2303 RenderThread* thread = RenderThread::current();
2295 // Will be NULL during unit tests. 2304 // Will be NULL during unit tests.
2296 if (thread) { 2305 if (thread) {
2297 thread->spellchecker()->SpellCheckWord( 2306 thread->spellchecker()->SpellCheckWord(
2298 word.c_str(), word.size(), document_tag_, 2307 word.c_str(), word.size(), document_tag_,
2299 &misspelled_offset, &misspelled_length, NULL); 2308 &misspelled_offset, &misspelled_length, NULL);
2300 } 2309 }
2301 } 2310 }
2302 2311
2312 void RenderView::requestCheckingOfText(
2313 const WebString& text,
2314 WebKit::WebTextCheckingCompletion* completion) {
2315 spellcheck_provider_->RequestTextChecking(text, document_tag_, completion);
2316 }
2317
2303 WebString RenderView::autoCorrectWord(const WebKit::WebString& word) { 2318 WebString RenderView::autoCorrectWord(const WebKit::WebString& word) {
2304 string16 autocorrect_word; 2319 string16 autocorrect_word;
2305 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 2320 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
2306 if (command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures)) { 2321 if (command_line.HasSwitch(switches::kExperimentalSpellcheckerFeatures)) {
2307 EnsureDocumentTag(); 2322 EnsureDocumentTag();
2308 RenderThread* thread = RenderThread::current(); 2323 RenderThread* thread = RenderThread::current();
2309 // Will be NULL during unit tests. 2324 // Will be NULL during unit tests.
2310 if (thread) { 2325 if (thread) {
2311 autocorrect_word = 2326 autocorrect_word =
2312 thread->spellchecker()->GetAutoCorrectionWord( 2327 thread->spellchecker()->GetAutoCorrectionWord(
(...skipping 3364 matching lines...) Expand 10 before | Expand all | Expand 10 after
5677 } 5692 }
5678 } 5693 }
5679 5694
5680 void RenderView::OnContextMenuClosed( 5695 void RenderView::OnContextMenuClosed(
5681 const webkit_glue::CustomContextMenuContext& custom_context) { 5696 const webkit_glue::CustomContextMenuContext& custom_context) {
5682 if (custom_context.is_pepper_menu) 5697 if (custom_context.is_pepper_menu)
5683 pepper_delegate_.OnContextMenuClosed(custom_context); 5698 pepper_delegate_.OnContextMenuClosed(custom_context);
5684 else 5699 else
5685 context_menu_node_.reset(); 5700 context_menu_node_.reset();
5686 } 5701 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.h ('k') | chrome/renderer/render_view_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698