diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 19:54:44 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 19:54:44 +0000 |
commit | 4c2f8195b9a5dc59d86434ab498ad609aa4034e4 (patch) | |
tree | 703240def49bf6a89a52447234d5bb53df3c1294 /webkit/glue/webkit_glue.h | |
parent | 088eb05f489f805c728fdceafc813a0f589a03da (diff) | |
download | chromium_src-4c2f8195b9a5dc59d86434ab498ad609aa4034e4.zip chromium_src-4c2f8195b9a5dc59d86434ab498ad609aa4034e4.tar.gz chromium_src-4c2f8195b9a5dc59d86434ab498ad609aa4034e4.tar.bz2 |
Add a webkit_glue API for lanching NaCl's sel_ldr. NaCl will call this API via
Pepper. This API is based on an existing piece of code used by NaCl's NPAPI
plugin, which will be removed once we get the Pepper plugin off the ground.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.h')
-rw-r--r-- | webkit/glue/webkit_glue.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 80fe90e..fbb541a 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -109,7 +109,7 @@ std::string CreateHistoryStateForURL(const GURL& url); // Removes any form data state from the history state string |content_state|. std::string RemoveFormDataFromHistoryState(const std::string& content_state); -// Removes scroll offset from the history state string |content_state|.
+// Removes scroll offset from the history state string |content_state|. std::string RemoveScrollOffsetFromHistoryState( const std::string& content_state); @@ -275,6 +275,12 @@ void EnableSpdy(bool enable); // Notifies the browser that the given action has been performed. void UserMetricsRecordAction(const std::string& action); +#if !defined(DISABLE_NACL) +// Launch NaCl's sel_ldr process. +bool LaunchSelLdr(const char* alleged_url, int socket_count, void* imc_handles, + void* nacl_process_handle, int* nacl_process_id); +#endif + #if defined(OS_LINUX) // Return a read-only file descriptor to the font which best matches the given // properties or -1 on failure. |