Index: ppapi/cpp/dev/url_util_dev.h |
diff --git a/ppapi/cpp/dev/url_util_dev.h b/ppapi/cpp/dev/url_util_dev.h |
index 3be217e011a3967de70af5d2d0a11a5b3cdfaf26..cebedf5a9343f349aa9bdd71b31747d1e6058a9c 100644 |
--- a/ppapi/cpp/dev/url_util_dev.h |
+++ b/ppapi/cpp/dev/url_util_dev.h |
@@ -13,39 +13,41 @@ namespace pp { |
class Instance; |
class Module; |
-// Simple wrapper around the PPB_UrlUtil interface. |
-class UrlUtil_Dev { |
+// Simple wrapper around the PPB_URLUtil interface. |
+class URLUtil_Dev { |
public: |
// This class is just a collection of random functions that aren't |
// particularly attached to anything. So this getter returns a cached |
// instance of this interface. This may return NULL if the browser doesn't |
- // support the UrlUtil inteface. Since this is a singleton, don't delete the |
+ // support the URLUtil inteface. Since this is a singleton, don't delete the |
// pointer. |
- static const UrlUtil_Dev* Get(); |
+ static const URLUtil_Dev* Get(); |
Var Canonicalize(const Var& url, |
- PP_UrlComponents_Dev* components = NULL) const; |
+ PP_URLComponents_Dev* components = NULL) const; |
- Var ResolveRelativeToUrl(const Var& base_url, |
+ Var ResolveRelativeToURL(const Var& base_url, |
const Var& relative_string, |
- PP_UrlComponents_Dev* components = NULL) const; |
+ PP_URLComponents_Dev* components = NULL) const; |
Var ResoveRelativeToDocument(const Instance& instance, |
const Var& relative_string, |
- PP_UrlComponents_Dev* components = NULL) const; |
+ PP_URLComponents_Dev* components = NULL) const; |
bool IsSameSecurityOrigin(const Var& url_a, const Var& url_b) const; |
bool DocumentCanRequest(const Instance& instance, const Var& url) const; |
bool DocumentCanAccessDocument(const Instance& active, |
const Instance& target) const; |
+ Var GetDocumentURL(const Instance& instance, |
+ PP_URLComponents_Dev* components = NULL) const; |
private: |
- UrlUtil_Dev() : interface_(NULL) {} |
+ URLUtil_Dev() : interface_(NULL) {} |
// Copy and assignment are disallowed. |
- UrlUtil_Dev(const UrlUtil_Dev& other); |
- UrlUtil_Dev& operator=(const UrlUtil_Dev& other); |
+ URLUtil_Dev(const URLUtil_Dev& other); |
+ URLUtil_Dev& operator=(const URLUtil_Dev& other); |
- const PPB_UrlUtil_Dev* interface_; |
+ const PPB_URLUtil_Dev* interface_; |
}; |
} // namespace pp |