| Index: chrome/renderer/spellchecker/spellcheck_worditerator.cc
|
| diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.cc b/chrome/renderer/spellchecker/spellcheck_worditerator.cc
|
| index 3f5d69c66fe024bda612a4a8209b03a57fbcae8f..1e9980b20d4a0377af151d7cb19e1b65b150e768 100644
|
| --- a/chrome/renderer/spellchecker/spellcheck_worditerator.cc
|
| +++ b/chrome/renderer/spellchecker/spellcheck_worditerator.cc
|
| @@ -9,16 +9,15 @@
|
| #include <map>
|
| #include <string>
|
|
|
| -#include "unicode/normlzr.h"
|
| -#include "unicode/schriter.h"
|
| -#include "unicode/uscript.h"
|
| -#include "unicode/ulocdata.h"
|
| -
|
| #include "base/basictypes.h"
|
| #include "base/logging.h"
|
| -#include "base/string_util.h"
|
| +#include "base/stringprintf.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/renderer/spellchecker/spellcheck.h"
|
| +#include "unicode/normlzr.h"
|
| +#include "unicode/schriter.h"
|
| +#include "unicode/uscript.h"
|
| +#include "unicode/ulocdata.h"
|
|
|
| // SpellcheckCharAttribute implementation:
|
|
|
| @@ -169,10 +168,18 @@ void SpellcheckCharAttribute::CreateRuleSets(const std::string& language) {
|
| "$ALetterEx ($MidLetterEx | $MidNumLetEx) $ALetterEx {200};";
|
| const char kDisallowContraction[] = "";
|
|
|
| - ruleset_allow_contraction_ = ASCIIToUTF16(StringPrintf(kRuleTemplate,
|
| - aletter, midletter_extra, aletter_plus, kAllowContraction));
|
| - ruleset_disallow_contraction_ = ASCIIToUTF16(StringPrintf(kRuleTemplate,
|
| - aletter, midletter_extra, aletter_plus, kDisallowContraction));
|
| + ruleset_allow_contraction_ = ASCIIToUTF16(
|
| + base::StringPrintf(kRuleTemplate,
|
| + aletter,
|
| + midletter_extra,
|
| + aletter_plus,
|
| + kAllowContraction));
|
| + ruleset_disallow_contraction_ = ASCIIToUTF16(
|
| + base::StringPrintf(kRuleTemplate,
|
| + aletter,
|
| + midletter_extra,
|
| + aletter_plus,
|
| + kDisallowContraction));
|
| }
|
|
|
| bool SpellcheckCharAttribute::OutputChar(UChar c, string16* output) const {
|
|
|