Enables the user to select multiple languages for spellchecking (UI)

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"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/renderer_context_menu/spelling_bubble_model.h"
 #include "chrome/browser/spellchecker/feedback_sender.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_host_metrics.h"
 #include "chrome/browser/spellchecker/spellcheck_platform_mac.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/spellchecker/spelling_service_client.h"
 #include "chrome/browser/ui/confirm_bubble.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/spellcheck_common.h"
 #include "chrome/common/spellcheck_result.h"
 #include "chrome/grit/generated_resources.h"
 #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"
 
@@ skipping 163 matching lines @@
     default:
       return false;
   }
 }
 
 bool SpellingMenuObserver::IsCommandIdChecked(int command_id) {
   DCHECK(IsCommandIdSupported(command_id));
   Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
 
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_TOGGLE)
     return integrate_spelling_service_.GetValue() && !profile->IsOffTheRecord();

[please use gerrit instead, 2015/06/21 23:43:44]

&& !chrome::spellcheck_common::IsMultilingualSpellcheckEnabled();

[Julius, 2015/06/24 21:17:58]

Done.

   if (command_id == IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE)
     return autocorrect_spelling_.GetValue() && !profile->IsOffTheRecord();
   return false;
 }
 
 bool SpellingMenuObserver::IsCommandIdEnabled(int command_id) {
   DCHECK(IsCommandIdSupported(command_id));
 
   if (command_id >= IDC_SPELLCHECK_SUGGESTION_0 &&
       command_id <= IDC_SPELLCHECK_SUGGESTION_LAST)
     return true;
 
   Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
   switch (command_id) {
     case IDC_SPELLCHECK_ADD_TO_DICTIONARY:
       return !misspelled_word_.empty();
 
     case IDC_CONTENT_CONTEXT_NO_SPELLING_SUGGESTIONS:
       return false;
 
     case IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION:
       return succeeded_;
 
     case IDC_CONTENT_CONTEXT_SPELLING_TOGGLE:
       return integrate_spelling_service_.IsUserModifiable() &&
-             !profile->IsOffTheRecord();
+             !profile->IsOffTheRecord() &&
+             !chrome::spellcheck_common::IsMultilingualSpellcheckEnabled();
 
     case IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE:
       return integrate_spelling_service_.IsUserModifiable() &&
              !profile->IsOffTheRecord();
 
     default:
       return false;
   }
 }
 
@@ skipping 160 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);
 }