summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 22:44:19 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 22:44:19 +0000
commit59cf702afa3a866943497ab4eb685543713e7a41 (patch)
tree92c50e4cd8cec76dbd12b8c4f18aef10b0b0f78d /ppapi/proxy
parent5d7a8757c73ead1497462c86070ec2b7d53662ef (diff)
downloadchromium_src-59cf702afa3a866943497ab4eb685543713e7a41.zip
chromium_src-59cf702afa3a866943497ab4eb685543713e7a41.tar.gz
chromium_src-59cf702afa3a866943497ab4eb685543713e7a41.tar.bz2
Convert dev interfaces to use the macro system.
This converts the non-"weird" dev interfaces to using the macro system. The trusted and private ones are still remaining. This moves the find implementation to the instance API which saves some code and routing. Review URL: http://codereview.chromium.org/7887021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/interface_id.h1
-rw-r--r--ppapi/proxy/interface_list.cc1
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc23
-rw-r--r--ppapi/proxy/ppb_instance_proxy.h6
4 files changed, 16 insertions, 15 deletions
diff --git a/ppapi/proxy/interface_id.h b/ppapi/proxy/interface_id.h
index 3b43943..1254adc 100644
--- a/ppapi/proxy/interface_id.h
+++ b/ppapi/proxy/interface_id.h
@@ -25,7 +25,6 @@ enum InterfaceID {
INTERFACE_ID_PPB_FILE_CHOOSER,
INTERFACE_ID_PPB_FILE_REF,
INTERFACE_ID_PPB_FILE_SYSTEM,
- INTERFACE_ID_PPB_FIND,
INTERFACE_ID_PPB_FLASH,
INTERFACE_ID_PPB_FLASH_CLIPBOARD,
INTERFACE_ID_PPB_FLASH_FILE_FILEREF,
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 0b386aa..87bc815 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -181,7 +181,6 @@ InterfaceList::InterfaceList() {
AddPPB(PPB_Flash_Menu_Proxy::GetInfo());
AddPPB(PPB_Flash_Proxy::GetInfo());
AddPPB(PPB_Flash_TCPSocket_Proxy::GetInfo());
- AddPPB(PPB_Instance_Proxy::GetInfoFullscreen());
AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
AddPPB(PPB_PDF_Proxy::GetInfo());
AddPPB(PPB_Testing_Proxy::GetInfo());
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 5dcf713..e08e73a 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -59,18 +59,6 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoPrivate() {
return &info;
}
-// static
-const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoFullscreen() {
- static const Info info = {
- ppapi::thunk::GetPPB_Fullscreen_Thunk(),
- PPB_FULLSCREEN_DEV_INTERFACE,
- INTERFACE_ID_NONE, // 1_0 is the canonical one.
- false,
- &CreateInstanceProxy,
- };
- return &info;
-}
-
bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
// Prevent the dispatcher from going away during a call to ExecuteScript.
// This must happen OUTSIDE of ExecuteScript since the SerializedVars use
@@ -183,6 +171,17 @@ void PPB_Instance_Proxy::LogWithSource(PP_Instance instance,
SerializedVarSendInput(dispatcher(), value)));
}
+void PPB_Instance_Proxy::NumberOfFindResultsChanged(PP_Instance instance,
+ int32_t total,
+ PP_Bool final_result) {
+ NOTIMPLEMENTED(); // Not proxied yet.
+}
+
+void PPB_Instance_Proxy::SelectedFindResultChanged(PP_Instance instance,
+ int32_t index) {
+ NOTIMPLEMENTED(); // Not proxied yet.
+}
+
PP_Bool PPB_Instance_Proxy::IsFullscreen(PP_Instance instance) {
InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
GetInstanceData(instance);
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 4199912..74784a1 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -29,7 +29,6 @@ class PPB_Instance_Proxy : public InterfaceProxy,
virtual ~PPB_Instance_Proxy();
static const Info* GetInfoPrivate();
- static const Info* GetInfoFullscreen();
// InterfaceProxy implementation.
virtual bool OnMessageReceived(const IPC::Message& msg);
@@ -53,6 +52,11 @@ class PPB_Instance_Proxy : public InterfaceProxy,
int log_level,
PP_Var source,
PP_Var value) OVERRIDE;
+ virtual void NumberOfFindResultsChanged(PP_Instance instance,
+ int32_t total,
+ PP_Bool final_result) OVERRIDE;
+ virtual void SelectedFindResultChanged(PP_Instance instance,
+ int32_t index) OVERRIDE;
virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE;
virtual PP_Bool SetFullscreen(PP_Instance instance,
PP_Bool fullscreen) OVERRIDE;