diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 18:08:33 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 18:08:33 +0000 |
| commit | df26f7a343115eee4173397b964c8e9060f8d4bc (patch) | |
| tree | 8e539ebb4c03d8bd74055f9b1f01baa552264953 /ppapi/proxy | |
| parent | 07c234afb79da58678041d152d15c547077ee93a (diff) | |
| download | chromium_src-df26f7a343115eee4173397b964c8e9060f8d4bc.zip chromium_src-df26f7a343115eee4173397b964c8e9060f8d4bc.tar.gz chromium_src-df26f7a343115eee4173397b964c8e9060f8d4bc.tar.bz2 | |
Hook up the file chooser proxy 0.6
This also removes the "old" style registration for the 0.5 version.
BUG=122440
TEST=
Review URL: http://codereview.chromium.org/10008064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/interface_list.cc | 1 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_file_chooser_proxy.cc | 12 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_file_chooser_proxy.h | 4 |
3 files changed, 1 insertions, 16 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 53b8db1..6d05722 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -213,7 +213,6 @@ InterfaceList::InterfaceList() { // PPB (browser) interfaces. // Do not add more stuff here, they should be added to interface_list*.h // TODO(brettw) remove these. - AddPPB(PPB_FileChooser_Proxy::GetTrustedInfo()); AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); AddPPB(PPB_PDF_Proxy::GetInfo()); AddPPB(PPB_Testing_Proxy::GetInfo()); diff --git a/ppapi/proxy/ppb_file_chooser_proxy.cc b/ppapi/proxy/ppb_file_chooser_proxy.cc index 298e9ae..466d0e6 100644 --- a/ppapi/proxy/ppb_file_chooser_proxy.cc +++ b/ppapi/proxy/ppb_file_chooser_proxy.cc @@ -201,18 +201,6 @@ PPB_FileChooser_Proxy::~PPB_FileChooser_Proxy() { } // static -const InterfaceProxy::Info* PPB_FileChooser_Proxy::GetTrustedInfo() { - static const Info info = { - thunk::GetPPB_FileChooser_Trusted_0_5_Thunk(), - PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5, - API_ID_NONE, // FILE_CHOOSER is the canonical one. - false, - &CreateFileChooserProxy - }; - return &info; -} - -// static PP_Resource PPB_FileChooser_Proxy::CreateProxyResource( PP_Instance instance, PP_FileChooserMode_Dev mode, diff --git a/ppapi/proxy/ppb_file_chooser_proxy.h b/ppapi/proxy/ppb_file_chooser_proxy.h index 530aec3..a0bfc0a 100644 --- a/ppapi/proxy/ppb_file_chooser_proxy.h +++ b/ppapi/proxy/ppb_file_chooser_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -30,8 +30,6 @@ class PPB_FileChooser_Proxy : public InterfaceProxy { explicit PPB_FileChooser_Proxy(Dispatcher* dispatcher); virtual ~PPB_FileChooser_Proxy(); - static const Info* GetTrustedInfo(); - static PP_Resource CreateProxyResource( PP_Instance instance, PP_FileChooserMode_Dev mode, |