Desktop context menu reorganisation

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 17 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.h"
 #include "extensions/browser/view_type_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 
 using content::BrowserThread;
 
+const int kMaxSpellingSuggestions = 3;
+
 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());
@@ skipping 24 matching lines @@
   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() &&
+  size_t length = params.dictionary_suggestions.size() > kMaxSpellingSuggestions
+    ? kMaxSpellingSuggestions : params.dictionary_suggestions.size();

[Avi (use Gerrit), 2015/09/26 02:26:15]

std::min!

(Bad indenting, anyway.)

[edwardjung, 2015/09/28 14:11:25]

Apologies, my poor C++ knowledge is really showing.

+  for (size_t i = 0; i < length &&
        IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
        ++i) {
     proxy_->AddMenuItem(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
                         params.dictionary_suggestions[i]);
   }
 
   // The service types |SpellingServiceClient::SPELLCHECK| and
   // |SpellingServiceClient::SUGGEST| are mutually exclusive. Only one is
   // available at at time.
   //
@@ skipping 46 matching lines @@
         base::Bind(&SpellingMenuObserver::OnTextCheckComplete,
                    base::Unretained(this),
                    SpellingServiceClient::SUGGEST));
     if (result) {
       loading_frame_ = 0;
       animation_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(1),
           this, &SpellingMenuObserver::OnAnimationTimerExpired);
     }
   }
 
-  if (params.dictionary_suggestions.empty()) {
-    proxy_->AddMenuItem(
-        IDC_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS,
-        l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS));
-    bool use_spelling_service = SpellingServiceClient::IsAvailable(
-        browser_context, SpellingServiceClient::SPELLCHECK);
-    if (use_suggestions || use_spelling_service)
-      proxy_->AddSeparator();
-  } else {
-    proxy_->AddSeparator();
-
+  if (!params.dictionary_suggestions.empty()) {
     // |spellcheck_service| can be null when the suggested word is
     // provided by Web SpellCheck API.
     SpellcheckService* spellcheck_service =
         SpellcheckServiceFactory::GetForContext(browser_context);
     if (spellcheck_service && spellcheck_service->GetMetrics())
       spellcheck_service->GetMetrics()->RecordSuggestionStats(1);
   }
 
   // If word is misspelled, give option for "Add to dictionary" and, if
   // multilingual spellchecking is not enabled, a check item "Ask Google for
@@ skipping 239 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);
 }