diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-24 09:18:27 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-24 09:18:27 +0000 |
| commit | 309d7a28aa6c938f60ac7a543ab4a73827d29562 (patch) | |
| tree | a806e83ff1533242c190a736519dbd31d43fb1e6 /webkit/glue | |
| parent | cb2c560e5c5761329e614aeeaeb6ccb5dcfc1987 (diff) | |
| download | chromium_src-309d7a28aa6c938f60ac7a543ab4a73827d29562.zip chromium_src-309d7a28aa6c938f60ac7a543ab4a73827d29562.tar.gz chromium_src-309d7a28aa6c938f60ac7a543ab4a73827d29562.tar.bz2 | |
Add basic infrastructure for sending async browser API request and receiving results.
Review URL: http://codereview.chromium.org/42262
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webframe.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index 76b50c6..8f38362 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -32,6 +32,8 @@ class WebFrame { public: WebFrame() {} + static WebFrame* RetrieveActiveFrame(); + // Binds a C++ class to a JavaScript property of the window object. This // should generally be used via CppBoundClass::BindToJavascript() instead of // calling it directly. diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 49a6a08..818d272 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -321,6 +321,15 @@ class ChromePrintContext : public WebCore::PrintContext { int WebFrameImpl::live_object_count_ = 0; +// static +WebFrame* WebFrame::RetrieveActiveFrame() { + WebCore::Frame* frame = WebCore::ScriptController::retrieveActiveFrame(); + if (frame) + return WebFrameImpl::FromFrame(frame); + else + return NULL; +} + WebFrameImpl::WebFrameImpl() // Don't complain about using "this" in initializer list. MSVC_PUSH_DISABLE_WARNING(4355) |