| Index: ppapi/proxy/ppb_char_set_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_char_set_proxy.cc (revision 73960)
|
| +++ ppapi/proxy/ppb_char_set_proxy.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -79,12 +79,17 @@
|
| return result.Return(dispatcher);
|
| }
|
|
|
| -const PPB_CharSet_Dev ppb_charset_interface = {
|
| +const PPB_CharSet_Dev charset_interface = {
|
| &UTF16ToCharSet,
|
| &CharSetToUTF16,
|
| &GetDefaultCharSet
|
| };
|
|
|
| +InterfaceProxy* CreateCharSetProxy(Dispatcher* dispatcher,
|
| + const void* target_interface) {
|
| + return new PPB_CharSet_Proxy(dispatcher, target_interface);
|
| +}
|
| +
|
| } // namespace
|
|
|
| PPB_CharSet_Proxy::PPB_CharSet_Proxy(Dispatcher* dispatcher,
|
| @@ -96,14 +101,18 @@
|
| PPB_CharSet_Proxy::~PPB_CharSet_Proxy() {
|
| }
|
|
|
| -const void* PPB_CharSet_Proxy::GetSourceInterface() const {
|
| - return &ppb_charset_interface;
|
| +// static
|
| +const InterfaceProxy::Info* PPB_CharSet_Proxy::GetInfo() {
|
| + static const Info info = {
|
| + &charset_interface,
|
| + PPB_CHAR_SET_DEV_INTERFACE,
|
| + INTERFACE_ID_PPB_CHAR_SET,
|
| + false,
|
| + &CreateCharSetProxy,
|
| + };
|
| + return &info;
|
| }
|
|
|
| -InterfaceID PPB_CharSet_Proxy::GetInterfaceId() const {
|
| - return INTERFACE_ID_PPB_CHAR_SET;
|
| -}
|
| -
|
| bool PPB_CharSet_Proxy::OnMessageReceived(const IPC::Message& msg) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(PPB_CharSet_Proxy, msg)
|
|
|