diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/context_menu.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/context_menu.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/context_menu.cc b/webkit/glue/context_menu.cc index 390d740..bdfe790 100644 --- a/webkit/glue/context_menu.cc +++ b/webkit/glue/context_menu.cc @@ -18,7 +18,7 @@ ContextMenuParams::ContextMenuParams(const WebKit::WebContextMenuData& data) page_url(data.pageURL), frame_url(data.frameURL), media_flags(data.mediaFlags), - selection_text(UTF16ToWideHack(data.selectedText)), + selection_text(data.selectedText), misspelled_word(data.misspelledWord), spellcheck_enabled(data.isSpellCheckingEnabled), is_editable(data.isEditable), diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h index b681a38..c87de41 100644 --- a/webkit/glue/context_menu.h +++ b/webkit/glue/context_menu.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/utf_string_conversions.h" +#include "base/string16.h" #include "googleurl/src/gurl.h" #include "webkit/glue/webmenuitem.h" @@ -57,7 +57,7 @@ struct ContextMenuParams { int media_flags; // This is the text of the selection that the context menu was invoked on. - std::wstring selection_text; + string16 selection_text; // The misspelled word under the cursor, if any. Used to generate the // |dictionary_suggestions| list. |