diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 21:50:53 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 21:50:53 +0000 |
| commit | a8f914871101974a4856248630c08454b7a7d294 (patch) | |
| tree | 322d2cf9c312b7ad60103c59bad660fab187e204 /webkit/glue/webtextinput_impl.h | |
| parent | b38f85b26762e22775e63618f005d6c55a29ef43 (diff) | |
| download | chromium_src-a8f914871101974a4856248630c08454b7a7d294.zip chromium_src-a8f914871101974a4856248630c08454b7a7d294.tar.gz chromium_src-a8f914871101974a4856248630c08454b7a7d294.tar.bz2 | |
Properly convert from UTF8 to UTF16 in WebTextInputImpl.
String util changes by darin@chromium.org.
BUG=11699
Review URL: http://codereview.chromium.org/115215
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webtextinput_impl.h')
| -rw-r--r-- | webkit/glue/webtextinput_impl.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/glue/webtextinput_impl.h b/webkit/glue/webtextinput_impl.h index c7a162b..8344f7e 100644 --- a/webkit/glue/webtextinput_impl.h +++ b/webkit/glue/webtextinput_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -6,8 +6,8 @@ // used by TextInputController in test_shell. It only facilitates layout tests // and should not be used by renderers. -#ifndef WEBKIT_GLUE_WEBTEXTINPUT_IMPL_H__ -#define WEBKIT_GLUE_WEBTEXTINPUT_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBTEXTINPUT_IMPL_H_ +#define WEBKIT_GLUE_WEBTEXTINPUT_IMPL_H_ #include "webkit/glue/webtextinput.h" @@ -19,9 +19,9 @@ class WebTextInputImpl : public WebTextInput { virtual ~WebTextInputImpl(); // WebTextInput methods - virtual void InsertText(const std::string& text); - virtual void DoCommand(const std::string& command); - virtual void SetMarkedText(const std::string& text, + virtual void InsertText(const string16& text); + virtual void DoCommand(const string16& command); + virtual void SetMarkedText(const string16& text, int32_t location, int32_t length); virtual void UnMarkText(); virtual bool HasMarkedText(); @@ -49,7 +49,7 @@ class WebTextInputImpl : public WebTextInput { // Holding a non-owning pointer to the web frame we are associated with. WebFrameImpl* web_frame_impl_; - DISALLOW_EVIL_CONSTRUCTORS(WebTextInputImpl); + DISALLOW_COPY_AND_ASSIGN(WebTextInputImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBTEXTINPUT_IMPL_H__ +#endif // #ifndef WEBKIT_GLUE_WEBTEXTINPUT_IMPL_H_ |