summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframe_impl.h
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:50:16 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:50:16 +0000
commitf8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd (patch)
tree7d8eafaff84f2dc9a32072c9b5de115d7f535500 /webkit/glue/webframe_impl.h
parent3adb24ec4914ccb68cb9db958eadba2f54b58fe0 (diff)
downloadchromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.zip
chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.gz
chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.bz2
src/webkit side of webKit merge 38653:38729
Review URL: http://codereview.chromium.org/12708 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.h')
-rw-r--r--webkit/glue/webframe_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 497b698..320a114 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -96,7 +96,7 @@ class WebFrameImpl : public WebFrame {
bool replace,
const GURL& fake_url);
virtual void ExecuteJavaScript(const std::string& js_code,
- const std::string& script_url);
+ const GURL& script_url);
virtual bool GetPreviousState(GURL* url, std::wstring* title,
std::string* history_state) const;
virtual bool GetCurrentState(GURL* url, std::wstring* title,