diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 19:17:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 19:17:32 +0000 |
| commit | 2a3a7764dc3343682a888f194c59b9ad48729e4b (patch) | |
| tree | a99a6831e8ae561ff3230b254496aa3705684ef2 /webkit/glue | |
| parent | 58ce21e623685e1e7b4c97ed7d59fbfb9c8e9801 (diff) | |
| download | chromium_src-2a3a7764dc3343682a888f194c59b9ad48729e4b.zip chromium_src-2a3a7764dc3343682a888f194c59b9ad48729e4b.tar.gz chromium_src-2a3a7764dc3343682a888f194c59b9ad48729e4b.tar.bz2 | |
Convert the spellchecker and associated messages and functions to use string16
for words instead of wstring. I also changed some places where it converted the
word to a string to do that conversion at the last possible second before
giving it to Hunspell (since this conversion isn't needed for Mac).
TEST=Covered by unit tests
BUG=none
Review URL: http://codereview.chromium.org/274077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/context_menu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h index b9937c9..a47f74b 100644 --- a/webkit/glue/context_menu.h +++ b/webkit/glue/context_menu.h @@ -56,14 +56,14 @@ struct ContextMenuParams { // The misspelled word under the cursor, if any. Used to generate the // |dictionary_suggestions| list. - std::wstring misspelled_word; + string16 misspelled_word; // Suggested replacements for a misspelled word under the cursor. // This vector gets populated in the render process host // by intercepting ViewHostMsg_ContextMenu in ResourceMessageFilter // and populating dictionary_suggestions if the type is EDITABLE // and the misspelled_word is not empty. - std::vector<std::wstring> dictionary_suggestions; + std::vector<string16> dictionary_suggestions; // If editable, flag for whether spell check is enabled or not. bool spellcheck_enabled; @@ -94,7 +94,7 @@ struct ContextMenuParams { frame_url(data.frameURL), media_flags(data.mediaFlags), selection_text(UTF16ToWideHack(data.selectedText)), - misspelled_word(UTF16ToWideHack(data.misspelledWord)), + misspelled_word(data.misspelledWord), spellcheck_enabled(data.isSpellCheckingEnabled), is_editable(data.isEditable), edit_flags(data.editFlags), |