| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/proxy/ppb_url_util_proxy.h" | 5 #include "ppapi/proxy/ppb_url_util_proxy.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "ppapi/c/dev/ppb_url_util_dev.h" | 8 #include "ppapi/c/dev/ppb_url_util_dev.h" |
| 9 #include "ppapi/c/dev/ppb_var_deprecated.h" | 9 #include "ppapi/c/dev/ppb_var_deprecated.h" |
| 10 #include "ppapi/c/ppb_core.h" | 10 #include "ppapi/c/ppb_core.h" |
| 11 #include "ppapi/proxy/plugin_dispatcher.h" | 11 #include "ppapi/proxy/plugin_dispatcher.h" |
| 12 #include "ppapi/proxy/plugin_resource_tracker.h" | 12 #include "ppapi/proxy/plugin_resource_tracker.h" |
| 13 #include "ppapi/proxy/ppapi_messages.h" | 13 #include "ppapi/proxy/ppapi_messages.h" |
| 14 #include "ppapi/shared_impl/url_util_impl.h" | 14 #include "ppapi/shared_impl/url_util_impl.h" |
| 15 #include "ppapi/shared_impl/var.h" | 15 #include "ppapi/shared_impl/var.h" |
| 16 | 16 |
| 17 using ppapi::StringVar; | 17 namespace ppapi { |
| 18 using ppapi::URLUtilImpl; | |
| 19 | |
| 20 namespace pp { | |
| 21 namespace proxy { | 18 namespace proxy { |
| 22 | 19 |
| 23 namespace { | 20 namespace { |
| 24 | 21 |
| 25 PP_Var Canonicalize(PP_Var url, | 22 PP_Var Canonicalize(PP_Var url, |
| 26 PP_URLComponents_Dev* components) { | 23 PP_URLComponents_Dev* components) { |
| 27 return URLUtilImpl::Canonicalize(0, url, components); | 24 return URLUtilImpl::Canonicalize(0, url, components); |
| 28 } | 25 } |
| 29 | 26 |
| 30 // Helper function for the functions below that optionally take a components | 27 // Helper function for the functions below that optionally take a components |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 ppb_url_util_target()->GetDocumentURL(instance, NULL)); | 203 ppb_url_util_target()->GetDocumentURL(instance, NULL)); |
| 207 } | 204 } |
| 208 | 205 |
| 209 void PPB_URLUtil_Proxy::OnMsgGetPluginInstanceURL( | 206 void PPB_URLUtil_Proxy::OnMsgGetPluginInstanceURL( |
| 210 PP_Instance instance, SerializedVarReturnValue result) { | 207 PP_Instance instance, SerializedVarReturnValue result) { |
| 211 result.Return(dispatcher(), | 208 result.Return(dispatcher(), |
| 212 ppb_url_util_target()->GetPluginInstanceURL(instance, NULL)); | 209 ppb_url_util_target()->GetPluginInstanceURL(instance, NULL)); |
| 213 } | 210 } |
| 214 | 211 |
| 215 } // namespace proxy | 212 } // namespace proxy |
| 216 } // namespace pp | 213 } // namespace ppapi |
| 217 | 214 |
| OLD | NEW |