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

Side by Side Diff: chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.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: Addressed previous comments. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h" 5 #include "chrome/browser/renderer_context_menu/spellchecker_submenu_observer.h"
6 6
7 #include <algorithm>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/prefs/pref_member.h" 11 #include "base/prefs/pref_member.h"
10 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string_split.h"
14 #include "base/strings/string_util.h"
11 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 17 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
14 #include "chrome/browser/spellchecker/spellcheck_service.h" 18 #include "chrome/browser/spellchecker/spellcheck_service.h"
15 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
21 #include "chrome/common/spellcheck_common.h"
17 #include "chrome/common/spellcheck_messages.h" 22 #include "chrome/common/spellcheck_messages.h"
18 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
19 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
20 #include "content/public/browser/render_widget_host_view.h" 25 #include "content/public/browser/render_widget_host_view.h"
21 #include "extensions/browser/view_type_utils.h" 26 #include "extensions/browser/view_type_utils.h"
22 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/models/simple_menu_model.h" 28 #include "ui/base/models/simple_menu_model.h"
24 29
25 using content::BrowserThread; 30 using content::BrowserThread;
26 31
27 SpellCheckerSubMenuObserver::SpellCheckerSubMenuObserver( 32 SpellCheckerSubMenuObserver::SpellCheckerSubMenuObserver(
28 RenderViewContextMenuProxy* proxy, 33 RenderViewContextMenuProxy* proxy,
29 ui::SimpleMenuModel::Delegate* delegate, 34 ui::SimpleMenuModel::Delegate* delegate,
30 int group) 35 int group)
31 : proxy_(proxy), 36 : proxy_(proxy),
32 submenu_model_(delegate), 37 submenu_model_(delegate),
33 language_group_(group), 38 language_group_(group),
34 language_selected_(0) { 39 selected_languages_(0) {
35 DCHECK(proxy_); 40 DCHECK(proxy_);
36 } 41 }
37 42
38 SpellCheckerSubMenuObserver::~SpellCheckerSubMenuObserver() { 43 SpellCheckerSubMenuObserver::~SpellCheckerSubMenuObserver() {
39 } 44 }
40 45
41 void SpellCheckerSubMenuObserver::InitMenu( 46 void SpellCheckerSubMenuObserver::InitMenu(
42 const content::ContextMenuParams& params) { 47 const content::ContextMenuParams& params) {
43 DCHECK_CURRENTLY_ON(BrowserThread::UI); 48 DCHECK_CURRENTLY_ON(BrowserThread::UI);
44 49
45 // Add available spell-checker languages to the sub menu. 50 // Add available spell-checker languages to the sub menu.
46 content::BrowserContext* browser_context = proxy_->GetBrowserContext(); 51 content::BrowserContext* browser_context = proxy_->GetBrowserContext();
47 DCHECK(browser_context); 52 DCHECK(browser_context);
48 language_selected_ = 53 selected_languages_ =
49 SpellcheckService::GetSpellCheckLanguages(browser_context, &languages_); 54 SpellcheckService::GetSpellCheckLanguages(browser_context, &languages_);
50 DCHECK(languages_.size() < 55 DCHECK(languages_.size() <
51 IDC_SPELLCHECK_LANGUAGES_LAST - IDC_SPELLCHECK_LANGUAGES_FIRST); 56 IDC_SPELLCHECK_LANGUAGES_LAST - IDC_SPELLCHECK_LANGUAGES_FIRST);
52 const std::string app_locale = g_browser_process->GetApplicationLocale(); 57 const std::string app_locale = g_browser_process->GetApplicationLocale();
58
53 for (size_t i = 0; i < languages_.size(); ++i) { 59 for (size_t i = 0; i < languages_.size(); ++i) {
54 base::string16 display_name( 60 base::string16 display_name(
55 l10n_util::GetDisplayNameForLocale(languages_[i], app_locale, true)); 61 l10n_util::GetDisplayNameForLocale(languages_[i], app_locale, true));
56 submenu_model_.AddRadioItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i, 62 if (chrome::spellcheck_common::MultilingualSpellcheckIsEnabled()) {
57 display_name, 63 submenu_model_.AddCheckItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i,
58 language_group_); 64 display_name);
65 } else {
66 submenu_model_.AddRadioItem(IDC_SPELLCHECK_LANGUAGES_FIRST + i,
67 display_name, language_group_);
68 }
59 } 69 }
60 70
61 // Add an item that opens the 'fonts and languages options' page. 71 // Add an item that opens the 'fonts and languages options' page.
62 submenu_model_.AddSeparator(ui::NORMAL_SEPARATOR); 72 submenu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
63 submenu_model_.AddItemWithStringId( 73 submenu_model_.AddItemWithStringId(
64 IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, 74 IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
65 IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); 75 IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
66 76
67 // Add a 'Check spelling while typing' item in the sub menu. 77 // Add a 'Check spelling while typing' item in the sub menu.
68 submenu_model_.AddCheckItem( 78 submenu_model_.AddCheckItem(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 120 }
111 121
112 return false; 122 return false;
113 } 123 }
114 124
115 bool SpellCheckerSubMenuObserver::IsCommandIdChecked(int command_id) { 125 bool SpellCheckerSubMenuObserver::IsCommandIdChecked(int command_id) {
116 DCHECK(IsCommandIdSupported(command_id)); 126 DCHECK(IsCommandIdSupported(command_id));
117 127
118 if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST && 128 if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
119 command_id < IDC_SPELLCHECK_LANGUAGES_LAST) { 129 command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
120 return language_selected_ == command_id - IDC_SPELLCHECK_LANGUAGES_FIRST; 130 return selected_languages_ >
131 static_cast<size_t>(command_id - IDC_SPELLCHECK_LANGUAGES_FIRST);
121 } 132 }
122 133
123 // Check box for 'Check Spelling while typing'. 134 // Check box for 'Check Spelling while typing'.
124 if (command_id == IDC_CHECK_SPELLING_WHILE_TYPING) { 135 if (command_id == IDC_CHECK_SPELLING_WHILE_TYPING) {
125 Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext()); 136 Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
126 DCHECK(profile); 137 DCHECK(profile);
127 return profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck); 138 return profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck);
128 } 139 }
129 140
130 return false; 141 return false;
(...skipping 19 matching lines...) Expand all
150 161
151 return false; 162 return false;
152 } 163 }
153 164
154 void SpellCheckerSubMenuObserver::ExecuteCommand(int command_id) { 165 void SpellCheckerSubMenuObserver::ExecuteCommand(int command_id) {
155 DCHECK(IsCommandIdSupported(command_id)); 166 DCHECK(IsCommandIdSupported(command_id));
156 167
157 // Check to see if one of the spell check language ids have been clicked. 168 // Check to see if one of the spell check language ids have been clicked.
158 Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext()); 169 Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
159 DCHECK(profile); 170 DCHECK(profile);
171
160 if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST && 172 if (command_id >= IDC_SPELLCHECK_LANGUAGES_FIRST &&
161 command_id < IDC_SPELLCHECK_LANGUAGES_LAST) { 173 command_id < IDC_SPELLCHECK_LANGUAGES_LAST) {
162 const size_t language = command_id - IDC_SPELLCHECK_LANGUAGES_FIRST; 174 PrefService* prefs = profile->GetPrefs();
163 if (profile && language < languages_.size()) { 175 size_t language = command_id - IDC_SPELLCHECK_LANGUAGES_FIRST;
164 StringPrefMember dictionary_language; 176 DCHECK_LT(language, languages_.size());
165 dictionary_language.Init(prefs::kSpellCheckDictionary, 177
166 profile->GetPrefs()); 178 if (chrome::spellcheck_common::MultilingualSpellcheckIsEnabled()) {
167 dictionary_language.SetValue(languages_[language]); 179 std::vector<std::string> dictionary_languages =
180 chrome::spellcheck_common::GetDictionaryLanguagesPref(prefs);
181
182 auto found_language =
183 std::find(dictionary_languages.begin(), dictionary_languages.end(),
184 languages_[language]);
185
186 if (found_language != dictionary_languages.end())
187 dictionary_languages.erase(found_language);
188 else
189 dictionary_languages.push_back(languages_[language]);
190
191 prefs->SetString(
192 prefs::kSpellCheckDictionaries,
193 JoinString(dictionary_languages,
194 chrome::spellcheck_common::kDictionaryLanguagesSeparator));
195 } else {
196 prefs->SetString(prefs::kSpellCheckDictionary, languages_[language]);
168 } 197 }
169 return; 198 return;
170 } 199 }
171 200
172 switch (command_id) { 201 switch (command_id) {
173 case IDC_CHECK_SPELLING_WHILE_TYPING: 202 case IDC_CHECK_SPELLING_WHILE_TYPING:
174 profile->GetPrefs()->SetBoolean( 203 profile->GetPrefs()->SetBoolean(
175 prefs::kEnableContinuousSpellcheck, 204 prefs::kEnableContinuousSpellcheck,
176 !profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck)); 205 !profile->GetPrefs()->GetBoolean(prefs::kEnableContinuousSpellcheck));
177 break; 206 break;
178 } 207 }
179 } 208 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698