Revert "Remove spellcheck feedback."

chrome/browser/renderer_context_menu/spelling_menu_observer.cc

 // Copyright 2014 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/browser/renderer_context_menu/spelling_menu_observer.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/prefs/pref_service.h"
@@ skipping 19 matching lines @@
 #include "extensions/browser/view_type_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 
 using content::BrowserThread;
 
 SpellingMenuObserver::SpellingMenuObserver(RenderViewContextMenuProxy* proxy)
     : proxy_(proxy),
       loading_frame_(0),
       succeeded_(false),
+      misspelling_hash_(0),
       client_(new SpellingServiceClient) {
   if (proxy_ && proxy_->GetBrowserContext()) {
     Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
     integrate_spelling_service_.Init(prefs::kSpellCheckUseSpellingService,
                                      profile->GetPrefs());
     autocorrect_spelling_.Init(prefs::kEnableAutoSpellCorrect,
                                profile->GetPrefs());
   }
 }
 
@@ skipping 10 matching lines @@
   content::BrowserContext* browser_context = proxy_->GetBrowserContext();
   if (!params.is_editable || !browser_context)
     return;
 
   // Exit if there is no misspelled word.
   if (params.misspelled_word.empty())
     return;
 
   suggestions_ = params.dictionary_suggestions;
   misspelled_word_ = params.misspelled_word;
+  misspelling_hash_ = params.misspelling_hash;
 
   bool use_suggestions = SpellingServiceClient::IsAvailable(
       browser_context, SpellingServiceClient::SUGGEST);
 
   if (!suggestions_.empty() || use_suggestions)
     proxy_->AddSeparator();
 
   // Append Dictionary spell check suggestions.
   for (size_t i = 0; i < params.dictionary_suggestions.size() &&
        IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
@@ skipping 169 matching lines @@
         suggestions_[suggestion_index]);
     // GetSpellCheckHost() can return null when the suggested word is provided
     // by Web SpellCheck API.
     content::BrowserContext* browser_context = proxy_->GetBrowserContext();
     if (browser_context) {
       SpellcheckService* spellcheck =
           SpellcheckServiceFactory::GetForContext(browser_context);
       if (spellcheck) {
         if (spellcheck->GetMetrics())
           spellcheck->GetMetrics()->RecordReplacedWordStats(1);
+        spellcheck->GetFeedbackSender()->SelectedSuggestion(
+            misspelling_hash_, suggestion_index);
       }
     }
     return;
   }
 
   // When we choose the suggestion sent from the Spelling service, we replace
   // the misspelled word with the suggestion and add it to our custom-word
   // dictionary so this word is not marked as misspelled any longer.
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION) {
     proxy_->GetWebContents()->ReplaceMisspelling(result_);
     misspelled_word_ = result_;
   }
 
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION ||
       command_id == IDC_SPELLCHECK_ADD_TO_DICTIONARY) {
     // GetHostForProfile() can return null when the suggested word is provided
     // by Web SpellCheck API.
     content::BrowserContext* browser_context = proxy_->GetBrowserContext();
     if (browser_context) {
       SpellcheckService* spellcheck =
           SpellcheckServiceFactory::GetForContext(browser_context);
       if (spellcheck) {
         spellcheck->GetCustomDictionary()->AddWord(base::UTF16ToUTF8(
             misspelled_word_));
+        spellcheck->GetFeedbackSender()->AddedToDictionary(misspelling_hash_);
       }
     }
 #if defined(OS_MACOSX)
     spellcheck_mac::AddWord(misspelled_word_);
 #endif
   }
 
   Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
 
   // The spelling service can be toggled by the user only if it is not managed.
@@ skipping 42 matching lines @@
     } else {
       if (profile) {
         bool current_value = autocorrect_spelling_.GetValue();
         profile->GetPrefs()->SetBoolean(prefs::kEnableAutoSpellCorrect,
                                         !current_value);
       }
     }
   }
 }
 
+void SpellingMenuObserver::OnMenuCancel() {
+  content::BrowserContext* browser_context = proxy_->GetBrowserContext();
+  if (!browser_context)
+    return;
+  SpellcheckService* spellcheck =
+      SpellcheckServiceFactory::GetForContext(browser_context);
+  if (!spellcheck)
+    return;
+  spellcheck->GetFeedbackSender()->IgnoredSuggestions(misspelling_hash_);
+}
+
 void SpellingMenuObserver::OnTextCheckComplete(
     SpellingServiceClient::ServiceType type,
     bool success,
     const base::string16& text,
     const std::vector<SpellCheckResult>& results) {
   animation_timer_.Stop();
 
   // Scan the text-check results and replace the misspelled regions with
   // suggested words. If the replaced text is included in the suggestion list
   // provided by the local spellchecker, we show a "No suggestions from Google"
@@ skipping 33 matching lines @@
   // Append '.' characters to the end of "Checking".
   loading_frame_ = (loading_frame_ + 1) & 3;
   base::string16 loading_message =
       loading_message_ + base::string16(loading_frame_,'.');
 
   // Update the menu item with the text. We disable this item to prevent users
   // from selecting it.
   proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, false, false,
                          loading_message);
 }