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

Side by Side Diff: chrome/renderer/spellchecker/spellcheck.cc

Issue 1715683002: chrome: Use base's ContainsValue helper function instead of std::find (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing non ContainsValue changes Created 4 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/spellchecker/spellcheck.h" 5 #include "chrome/renderer/spellchecker/spellcheck.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
18 #include "base/stl_util.h"
18 #include "base/thread_task_runner_handle.h" 19 #include "base/thread_task_runner_handle.h"
19 #include "build/build_config.h" 20 #include "build/build_config.h"
20 #include "chrome/common/channel_info.h" 21 #include "chrome/common/channel_info.h"
21 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/spellcheck_common.h" 23 #include "chrome/common/spellcheck_common.h"
23 #include "chrome/common/spellcheck_messages.h" 24 #include "chrome/common/spellcheck_messages.h"
24 #include "chrome/common/spellcheck_result.h" 25 #include "chrome/common/spellcheck_result.h"
25 #include "chrome/renderer/spellchecker/spellcheck_language.h" 26 #include "chrome/renderer/spellchecker/spellcheck_language.h"
26 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 27 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
27 #include "content/public/renderer/render_thread.h" 28 #include "content/public/renderer/render_thread.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 188
188 for (size_t count = 0; count < (max_suggestions * num_languages); ++count) { 189 for (size_t count = 0; count < (max_suggestions * num_languages); ++count) {
189 size_t language = count % num_languages; 190 size_t language = count % num_languages;
190 size_t index = count / num_languages; 191 size_t index = count / num_languages;
191 192
192 if (suggestions_list[language].size() <= index) 193 if (suggestions_list[language].size() <= index)
193 continue; 194 continue;
194 195
195 const base::string16& suggestion = suggestions_list[language][index]; 196 const base::string16& suggestion = suggestions_list[language][index];
196 // Only add the suggestion if it's unique. 197 // Only add the suggestion if it's unique.
197 if (std::find(optional_suggestions->begin(), optional_suggestions->end(), 198 if (!ContainsValue(*optional_suggestions, suggestion)) {
198 suggestion) == optional_suggestions->end()) {
199 optional_suggestions->push_back(suggestion); 199 optional_suggestions->push_back(suggestion);
200 } 200 }
201 if (optional_suggestions->size() >= 201 if (optional_suggestions->size() >=
202 chrome::spellcheck_common::kMaxSuggestions) { 202 chrome::spellcheck_common::kMaxSuggestions) {
203 break; 203 break;
204 } 204 }
205 } 205 }
206 } 206 }
207 207
208 bool SpellCheck::OnControlMessageReceived(const IPC::Message& message) { 208 bool SpellCheck::OnControlMessageReceived(const IPC::Message& message) {
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 bool SpellCheck::IsSpellcheckEnabled() { 540 bool SpellCheck::IsSpellcheckEnabled() {
541 #if defined(OS_ANDROID) 541 #if defined(OS_ANDROID)
542 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 542 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
543 switches::kEnableAndroidSpellChecker)) { 543 switches::kEnableAndroidSpellChecker)) {
544 return false; 544 return false;
545 } 545 }
546 #endif 546 #endif
547 return spellcheck_enabled_; 547 return spellcheck_enabled_;
548 } 548 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698