summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.h
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 17:15:18 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 17:15:18 +0000
commit1783bd57b32908571ac610181f0cf1e3b7a3bb45 (patch)
tree84a3520038ac732f2f73561a1cac79fd7cecd069 /webkit/glue/webkit_glue.h
parent1823a7b446974dadf23a6f8d0ff85d60c196fa5e (diff)
downloadchromium_src-1783bd57b32908571ac610181f0cf1e3b7a3bb45.zip
chromium_src-1783bd57b32908571ac610181f0cf1e3b7a3bb45.tar.gz
chromium_src-1783bd57b32908571ac610181f0cf1e3b7a3bb45.tar.bz2
webkit: use string16 in webkit_glue.h
And a few places that it touches. BUG=23581 Review URL: http://codereview.chromium.org/5729005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.h')
-rw-r--r--webkit/glue/webkit_glue.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index d514984..728202b 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -64,7 +64,7 @@ string16 DumpRenderer(WebKit::WebFrame* web_frame);
// counter_value. Return false when the specified id doesn't exist.
bool CounterValueForElementById(WebKit::WebFrame* web_frame,
const std::string& id,
- std::wstring* counter_value);
+ string16* counter_value);
// Returns the number of page where the specified element will be put.
int PageNumberForElementById(WebKit::WebFrame* web_frame,
@@ -78,13 +78,12 @@ int NumberOfPages(WebKit::WebFrame* web_frame,
float page_height_in_pixels);
// Returns a dump of the scroll position of the webframe.
-std::wstring DumpFrameScrollPosition(WebKit::WebFrame* web_frame,
- bool recursive);
+string16 DumpFrameScrollPosition(WebKit::WebFrame* web_frame, bool recursive);
// Returns a dump of the given history state suitable for implementing the
// dumpBackForwardList command of the layoutTestController.
-std::wstring DumpHistoryState(const std::string& history_state, int indent,
- bool is_current);
+string16 DumpHistoryState(const std::string& history_state, int indent,
+ bool is_current);
// Cleans up state left over from the previous test run.
void ResetBeforeTestRun(WebKit::WebView* view);