Index: ppapi/thunk/interfaces_ppb_private.h |
diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h |
index 7e3988ef7e18967b84d57dce92ed250d85ce8248..e137c460d1f9573a1c27657322d1989d4b65a933 100644 |
--- a/ppapi/thunk/interfaces_ppb_private.h |
+++ b/ppapi/thunk/interfaces_ppb_private.h |
@@ -17,41 +17,28 @@ PROXIED_IFACE(PPB_X509CERTIFICATE_PRIVATE_INTERFACE_0_1, |
#if !defined(OS_NACL) |
PROXIED_API(PPB_Broker) |
-PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_2, |
- PPB_BrokerTrusted_0_2) |
-PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_3, |
- PPB_BrokerTrusted_0_3) |
+PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_2, PPB_BrokerTrusted_0_2) |
+PROXIED_IFACE(PPB_BROKER_TRUSTED_INTERFACE_0_3, PPB_BrokerTrusted_0_3) |
PROXIED_IFACE(PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0, |
PPB_BrowserFont_Trusted_1_0) |
PROXIED_IFACE(PPB_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_11, |
PPB_ContentDecryptor_Private_0_11) |
-PROXIED_IFACE(PPB_CHARSET_TRUSTED_INTERFACE_1_0, |
- PPB_CharSet_Trusted_1_0) |
-PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, |
- PPB_FileChooserTrusted_0_5) |
-PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6, |
- PPB_FileChooserTrusted_0_6) |
-PROXIED_IFACE(PPB_FILEREFPRIVATE_INTERFACE_0_1, |
- PPB_FileRefPrivate_0_1) |
-PROXIED_IFACE(PPB_FIND_PRIVATE_INTERFACE_0_3, |
- PPB_Find_Private_0_3) |
-PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_0_1, |
- PPB_FlashFullscreen_0_1) |
-PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_1_0, |
- PPB_FlashFullscreen_0_1) |
-PROXIED_IFACE(PPB_PDF_INTERFACE, |
- PPB_PDF) |
+PROXIED_IFACE(PPB_CHARSET_TRUSTED_INTERFACE_1_0, PPB_CharSet_Trusted_1_0) |
+PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, PPB_FileChooserTrusted_0_5) |
+PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6, PPB_FileChooserTrusted_0_6) |
+PROXIED_IFACE(PPB_FILEREFPRIVATE_INTERFACE_0_1, PPB_FileRefPrivate_0_1) |
+PROXIED_IFACE(PPB_FIND_PRIVATE_INTERFACE_0_3, PPB_Find_Private_0_3) |
+PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_0_1, PPB_FlashFullscreen_0_1) |
+PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_1_0, PPB_FlashFullscreen_0_1) |
+PROXIED_IFACE(PPB_PDF_INTERFACE, PPB_PDF) |
#if defined(OS_CHROMEOS) |
PROXIED_IFACE(PPB_PLATFORMVERIFICATION_PRIVATE_INTERFACE_0_2, |
PPB_PlatformVerification_Private_0_2) |
#endif |
-PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_1_0, |
- PPB_Talk_Private_1_0) |
-PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_2_0, |
- PPB_Talk_Private_2_0) |
+PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_1_0, PPB_Talk_Private_1_0) |
+PROXIED_IFACE(PPB_TALK_PRIVATE_INTERFACE_2_0, PPB_Talk_Private_2_0) |
-PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3, |
- PPB_URLLoaderTrusted_0_3) |
+PROXIED_IFACE(PPB_URLLOADERTRUSTED_INTERFACE_0_3, PPB_URLLoaderTrusted_0_3) |
PROXIED_IFACE(PPB_OUTPUTPROTECTION_PRIVATE_INTERFACE_0_1, |
PPB_OutputProtection_Private_0_1) |
@@ -59,8 +46,7 @@ PROXIED_IFACE(PPB_OUTPUTPROTECTION_PRIVATE_INTERFACE_0_1, |
// Hack to keep font working. The Font 0.6 API is binary compatible with |
// BrowserFont 1.0, so just map the string to the same thing. |
// TODO(brettw) remove support for the old Font API. |
-PROXIED_IFACE(PPB_FONT_DEV_INTERFACE_0_6, |
- PPB_BrowserFont_Trusted_1_0) |
+PROXIED_IFACE(PPB_FONT_DEV_INTERFACE_0_6, PPB_BrowserFont_Trusted_1_0) |
#endif // !defined(OS_NACL) |
#include "ppapi/thunk/interfaces_postamble.h" |