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

Unified Diff: chrome/browser/renderer_context_menu/spelling_menu_observer.cc

Issue 1156473007: Enables the user to select multiple languages for spellchecking (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits and rebased. Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_context_menu/spelling_menu_observer.cc
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
index dca75263598982f9a1d834e20bf82a6b57245b00..ba7f43308bf51bd6c8d43d65d6fa119705137876 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
@@ -22,6 +22,7 @@
#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"
@@ -164,13 +165,16 @@ void SpellingMenuObserver::InitMenu(const content::ContextMenuParams& params) {
spellcheck_service->GetMetrics()->RecordSuggestionStats(1);
}
- // If word is misspelled, give option for "Add to dictionary" and a check item
- // "Ask Google for suggestions".
+ // If word is misspelled, give option for "Add to dictionary" and, if
+ // multilingual spellchecking is not enabled, a check item "Ask Google for
+ // suggestions".
proxy_->AddMenuItem(IDC_SPELLCHECK_ADD_TO_DICTIONARY,
l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_ADD_TO_DICTIONARY));
- proxy_->AddCheckItem(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE,
- l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
+ if (!chrome::spellcheck_common::IsMultilingualSpellcheckEnabled()) {
+ proxy_->AddCheckItem(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE,
+ l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
+ }
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
@@ -205,7 +209,9 @@ bool SpellingMenuObserver::IsCommandIdChecked(int command_id) {
Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
if (command_id == IDC_CONTENT_CONTEXT_SPELLING_TOGGLE)
- return integrate_spelling_service_.GetValue() && !profile->IsOffTheRecord();
+ return integrate_spelling_service_.GetValue() &&
+ !profile->IsOffTheRecord() &&
+ !chrome::spellcheck_common::IsMultilingualSpellcheckEnabled();
if (command_id == IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE)
return autocorrect_spelling_.GetValue() && !profile->IsOffTheRecord();
return false;
@@ -231,7 +237,8 @@ bool SpellingMenuObserver::IsCommandIdEnabled(int command_id) {
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() &&

Powered by Google App Engine
This is Rietveld 408576698