| Index: ppapi/cpp/private/find_private.cc
|
| diff --git a/ppapi/cpp/dev/find_dev.cc b/ppapi/cpp/private/find_private.cc
|
| similarity index 54%
|
| rename from ppapi/cpp/dev/find_dev.cc
|
| rename to ppapi/cpp/private/find_private.cc
|
| index 1004b4970a31a45281cf4f676f69876aa06f7c38..0909f082a81e593fd3f8a5472aaec96d315050fb 100644
|
| --- a/ppapi/cpp/dev/find_dev.cc
|
| +++ b/ppapi/cpp/private/find_private.cc
|
| @@ -2,9 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ppapi/cpp/dev/find_dev.h"
|
| +#include "ppapi/cpp/private/find_private.h"
|
|
|
| -#include "ppapi/c/dev/ppb_find_dev.h"
|
| +#include "ppapi/c/private/ppb_find_private.h"
|
| #include "ppapi/cpp/instance.h"
|
| #include "ppapi/cpp/module.h"
|
| #include "ppapi/cpp/module_impl.h"
|
| @@ -13,11 +13,11 @@ namespace pp {
|
|
|
| namespace {
|
|
|
| -template <> const char* interface_name<PPB_Find_Dev>() {
|
| - return PPB_FIND_DEV_INTERFACE;
|
| +template <> const char* interface_name<PPB_Find_Private>() {
|
| + return PPB_FIND_PRIVATE_INTERFACE;
|
| }
|
|
|
| -static const char kPPPFindInterface[] = PPP_FIND_DEV_INTERFACE;
|
| +static const char kPPPFindInterface[] = PPP_FIND_PRIVATE_INTERFACE;
|
|
|
| PP_Bool StartFind(PP_Instance instance,
|
| const char* text,
|
| @@ -25,7 +25,7 @@ PP_Bool StartFind(PP_Instance instance,
|
| void* object = Instance::GetPerInstanceObject(instance, kPPPFindInterface);
|
| if (!object)
|
| return PP_FALSE;
|
| - bool return_value = static_cast<Find_Dev*>(object)->StartFind(
|
| + bool return_value = static_cast<Find_Private*>(object)->StartFind(
|
| text, PP_ToBool(case_sensitive));
|
| return PP_FromBool(return_value);
|
| }
|
| @@ -33,16 +33,16 @@ PP_Bool StartFind(PP_Instance instance,
|
| void SelectFindResult(PP_Instance instance, PP_Bool forward) {
|
| void* object = Instance::GetPerInstanceObject(instance, kPPPFindInterface);
|
| if (object)
|
| - static_cast<Find_Dev*>(object)->SelectFindResult(PP_ToBool(forward));
|
| + static_cast<Find_Private*>(object)->SelectFindResult(PP_ToBool(forward));
|
| }
|
|
|
| void StopFind(PP_Instance instance) {
|
| void* object = Instance::GetPerInstanceObject(instance, kPPPFindInterface);
|
| if (object)
|
| - static_cast<Find_Dev*>(object)->StopFind();
|
| + static_cast<Find_Private*>(object)->StopFind();
|
| }
|
|
|
| -const PPP_Find_Dev ppp_find = {
|
| +const PPP_Find_Private ppp_find = {
|
| &StartFind,
|
| &SelectFindResult,
|
| &StopFind
|
| @@ -50,33 +50,35 @@ const PPP_Find_Dev ppp_find = {
|
|
|
| } // namespace
|
|
|
| -Find_Dev::Find_Dev(Instance* instance) : associated_instance_(instance) {
|
| +Find_Private::Find_Private(Instance* instance)
|
| + : associated_instance_(instance) {
|
| Module::Get()->AddPluginInterface(kPPPFindInterface, &ppp_find);
|
| instance->AddPerInstanceObject(kPPPFindInterface, this);
|
| }
|
|
|
| -Find_Dev::~Find_Dev() {
|
| +Find_Private::~Find_Private() {
|
| Instance::RemovePerInstanceObject(associated_instance_,
|
| kPPPFindInterface, this);
|
| }
|
|
|
| -void Find_Dev::SetPluginToHandleFindRequests() {
|
| - if (has_interface<PPB_Find_Dev>()) {
|
| - get_interface<PPB_Find_Dev>()->SetPluginToHandleFindRequests(
|
| +void Find_Private::SetPluginToHandleFindRequests() {
|
| + if (has_interface<PPB_Find_Private>()) {
|
| + get_interface<PPB_Find_Private>()->SetPluginToHandleFindRequests(
|
| associated_instance_.pp_instance());
|
| }
|
| }
|
|
|
| -void Find_Dev::NumberOfFindResultsChanged(int32_t total, bool final_result) {
|
| - if (has_interface<PPB_Find_Dev>()) {
|
| - get_interface<PPB_Find_Dev>()->NumberOfFindResultsChanged(
|
| +void Find_Private::NumberOfFindResultsChanged(int32_t total,
|
| + bool final_result) {
|
| + if (has_interface<PPB_Find_Private>()) {
|
| + get_interface<PPB_Find_Private>()->NumberOfFindResultsChanged(
|
| associated_instance_.pp_instance(), total, PP_FromBool(final_result));
|
| }
|
| }
|
|
|
| -void Find_Dev::SelectedFindResultChanged(int32_t index) {
|
| - if (has_interface<PPB_Find_Dev>()) {
|
| - get_interface<PPB_Find_Dev>()->SelectedFindResultChanged(
|
| +void Find_Private::SelectedFindResultChanged(int32_t index) {
|
| + if (has_interface<PPB_Find_Private>()) {
|
| + get_interface<PPB_Find_Private>()->SelectedFindResultChanged(
|
| associated_instance_.pp_instance(), index);
|
| }
|
| }
|
|
|