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

Side by Side Diff: chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc

Issue 2961033002: Use ContainsValue() instead of std::find() in chrome/browser/extensions (Closed)
Patch Set: Reverted code changes in language_settings_private_api.cc:307 Created 3 years, 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/extensions/api/language_settings_private/language_setti ngs_private_api.h" 5 #include "chrome/browser/extensions/api/language_settings_private/language_setti ngs_private_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
11 #include <unordered_set> 11 #include <unordered_set>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "base/stl_util.h"
17 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
18 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
19 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
20 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
21 #include "base/values.h" 22 #include "base/values.h"
22 #include "build/build_config.h" 23 #include "build/build_config.h"
23 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/extensions/api/language_settings_private/language_setti ngs_private_delegate.h" 25 #include "chrome/browser/extensions/api/language_settings_private/language_setti ngs_private_delegate.h"
25 #include "chrome/browser/extensions/api/language_settings_private/language_setti ngs_private_delegate_factory.h" 26 #include "chrome/browser/extensions/api/language_settings_private/language_setti ngs_private_delegate_factory.h"
26 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 it = descriptors.erase(it); 132 it = descriptors.erase(it);
132 else 133 else
133 it++; 134 it++;
134 } 135 }
135 136
136 // For each language, add any candidate IMEs that support it. 137 // For each language, add any candidate IMEs that support it.
137 for (const auto& language : enabled_languages) { 138 for (const auto& language : enabled_languages) {
138 auto it = descriptors.begin(); 139 auto it = descriptors.begin();
139 while (it != descriptors.end() && descriptors.size()) { 140 while (it != descriptors.end() && descriptors.size()) {
140 if (extension_ime_set.count(it->id()) && 141 if (extension_ime_set.count(it->id()) &&
141 std::find(it->language_codes().begin(), it->language_codes().end(), 142 base::ContainsValue(it->language_codes(), language)) {
142 language) != it->language_codes().end()) {
143 extension_ime_list.push_back(it->id()); 143 extension_ime_list.push_back(it->id());
144 // Remove the added descriptor from the candidate list. 144 // Remove the added descriptor from the candidate list.
145 it = descriptors.erase(it); 145 it = descriptors.erase(it);
146 } else { 146 } else {
147 it++; 147 it++;
148 } 148 }
149 } 149 }
150 } 150 }
151 151
152 return extension_ime_list; 152 return extension_ime_list;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 EXTENSION_FUNCTION_VALIDATE(parameters.get()); 259 EXTENSION_FUNCTION_VALIDATE(parameters.get());
260 const std::string& language_code = parameters->language_code; 260 const std::string& language_code = parameters->language_code;
261 261
262 std::unique_ptr<translate::TranslatePrefs> translate_prefs = 262 std::unique_ptr<translate::TranslatePrefs> translate_prefs =
263 ChromeTranslateClient::CreateTranslatePrefs( 263 ChromeTranslateClient::CreateTranslatePrefs(
264 chrome_details_.GetProfile()->GetPrefs()); 264 chrome_details_.GetProfile()->GetPrefs());
265 265
266 std::vector<std::string> languages; 266 std::vector<std::string> languages;
267 translate_prefs->GetLanguageList(&languages); 267 translate_prefs->GetLanguageList(&languages);
268 268
269 if (std::find(languages.begin(), languages.end(), language_code) != 269 if (base::ContainsValue(languages, language_code)) {
270 languages.end()) {
271 LOG(ERROR) << "Language " << language_code << " already enabled"; 270 LOG(ERROR) << "Language " << language_code << " already enabled";
272 return RespondNow(NoArguments()); 271 return RespondNow(NoArguments());
273 } 272 }
274 273
275 languages.push_back(parameters->language_code); 274 languages.push_back(parameters->language_code);
276 translate_prefs->UpdateLanguageList(languages); 275 translate_prefs->UpdateLanguageList(languages);
277 276
278 return RespondNow(NoArguments()); 277 return RespondNow(NoArguments());
279 } 278 }
280 279
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 input_method_list.end(), input_method_id); 605 input_method_list.end(), input_method_id);
607 if (pos != input_method_list.end()) { 606 if (pos != input_method_list.end()) {
608 input_method_list.erase(pos); 607 input_method_list.erase(pos);
609 prefs->SetString(pref_name, base::JoinString(input_method_list, ",")); 608 prefs->SetString(pref_name, base::JoinString(input_method_list, ","));
610 } 609 }
611 #endif 610 #endif
612 return RespondNow(NoArguments()); 611 return RespondNow(NoArguments());
613 } 612 }
614 613
615 } // namespace extensions 614 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698