diff options
Diffstat (limited to 'webkit/glue/webkit_glue.h')
| -rw-r--r-- | webkit/glue/webkit_glue.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index f2d511b..59c7c17 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -40,15 +40,15 @@ WEBKIT_GLUE_EXPORT void SetJavaScriptFlags(const std::string& flags); WEBKIT_GLUE_EXPORT void EnableWebCoreLogChannels(const std::string& channels); // Returns the text of the document element. -WEBKIT_GLUE_EXPORT string16 DumpDocumentText(WebKit::WebFrame* web_frame); +WEBKIT_GLUE_EXPORT base::string16 DumpDocumentText(WebKit::WebFrame* web_frame); // Returns the text of the document element and optionally its child frames. // If recursive is false, this is equivalent to DumpDocumentText followed by // a newline. If recursive is true, it recursively dumps all frames as text. -string16 DumpFramesAsText(WebKit::WebFrame* web_frame, bool recursive); +base::string16 DumpFramesAsText(WebKit::WebFrame* web_frame, bool recursive); // Returns the renderer's description of its tree (its externalRepresentation). -WEBKIT_GLUE_EXPORT string16 DumpRenderer(WebKit::WebFrame* web_frame); +WEBKIT_GLUE_EXPORT base::string16 DumpRenderer(WebKit::WebFrame* web_frame); // Returns the number of page where the specified element will be put. int PageNumberForElementById(WebKit::WebFrame* web_frame, @@ -62,13 +62,15 @@ int NumberOfPages(WebKit::WebFrame* web_frame, float page_height_in_pixels); // Returns a dump of the scroll position of the webframe. -string16 DumpFrameScrollPosition(WebKit::WebFrame* web_frame, bool recursive); +base::string16 DumpFrameScrollPosition(WebKit::WebFrame* web_frame, + bool recursive); // Returns a dump of the given history state suitable for implementing the // dumpBackForwardList command of the testRunner. -WEBKIT_GLUE_EXPORT string16 DumpHistoryState(const std::string& history_state, - int indent, - bool is_current); +WEBKIT_GLUE_EXPORT base::string16 DumpHistoryState( + const std::string& history_state, + int indent, + bool is_current); #ifndef NDEBUG // Checks various important objects to see if there are any in memory, and |