[Spellcheck] Removing the "no more suggestions from Google" line when using the spelling service

chrome/browser/tab_contents/spelling_menu_observer.cc

 // Copyright (c) 2012 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/tab_contents/spelling_menu_observer.h"
 
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 68 matching lines @@
     // text to the result text so we can replace its misspelled regions with
     // suggestions.
     succeeded_ = false;
     result_ = params.misspelled_word;
 
     // Add a placeholder item. This item will be updated when we receive a
     // response from the Spelling service. (We do not have to disable this
     // item now since Chrome will call IsCommandIdEnabled() and disable it.)
     loading_message_ =
         l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_CHECKING);
-    proxy_->AddMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION,
-                        loading_message_);
-
+    if (!useSpellingService) {

[groby-ooo-7-16, 2012/12/21 22:18:13]

Can you add a browsertest?

[rpetterson, 2013/01/04 00:05:34]

Done.

+      proxy_->AddMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION,
+                          loading_message_);
+    }
     // Invoke a JSON-RPC call to the Spelling service in the background so we
     // can update the placeholder item when we receive its response. It also
     // starts the animation timer so we can show animation until we receive
     // it.
     SpellingServiceClient::ServiceType type = SpellingServiceClient::SUGGEST;
     if (useSpellingService)
       type = SpellingServiceClient::SPELLCHECK;
     client_.reset(new SpellingServiceClient);
     bool result = client_->RequestTextCheck(
         profile, 0, type, params.misspelled_word,
@@ skipping 152 matching lines @@
       if (profile)
         profile->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService,
                                         false);
     }
   }
 }
 
 void SpellingMenuObserver::OnTextCheckComplete(
     int tag,
     bool success,
+    SpellingServiceClient::ServiceType type,
     const 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"
   // message.
   succeeded_ = success;
   if (results.empty()) {
     succeeded_ = false;
   } else {
     typedef std::vector<SpellCheckResult> SpellCheckResults;
     for (SpellCheckResults::const_iterator it = results.begin();
          it != results.end(); ++it) {
       result_.replace(it->location, it->length, it->replacement);
     }
     string16 result = base::i18n::ToLower(result_);
     for (std::vector<string16>::const_iterator it = suggestions_.begin();
          it != suggestions_.end(); ++it) {
       if (result == base::i18n::ToLower(*it)) {
         succeeded_ = false;
         break;
       }
     }
   }
-  if (!succeeded_) {
-    result_ = l10n_util::GetStringUTF16(
-        IDS_CONTENT_CONTEXT_SPELLING_NO_SUGGESTIONS_FROM_GOOGLE);
+  if (type != SpellingServiceClient::SPELLCHECK) {

[groby-ooo-7-16, 2012/12/21 22:18:13]

Can you add a browsertest?

[rpetterson, 2013/01/04 00:05:34]

I think this and the one above both cover the same case, but let me know if you
think an additional browsertest is warranted and if so what it should test. The
added one tests that we do not show "No more spelling suggestions from Google"
after the suggestion.

+    if (!succeeded_) {
+      result_ = l10n_util::GetStringUTF16(
+          IDS_CONTENT_CONTEXT_SPELLING_NO_SUGGESTIONS_FROM_GOOGLE);
+    }
+
+    // Update the menu item with the result text. We disable this item and hide
+    // it when the spelling service does not provide valid suggestions.
+    proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, succeeded_,
+                           false, result_);
   }
-
-  // Update the menu item with the result text. We disable this item and hide it
-  // when the spelling service does not provide valid suggestions.
-  proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, succeeded_,
-                         false, result_);
 }
 
 void SpellingMenuObserver::OnAnimationTimerExpired() {
   // Append '.' characters to the end of "Checking".
   loading_frame_ = (loading_frame_ + 1) & 3;
   string16 loading_message = loading_message_ + 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);
 }