Add CefFindHandler for reporting find results (issue #1482).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1969 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2015-01-12 21:04:08 +00:00
parent a2d690a9bd
commit 758d5c23c5
18 changed files with 422 additions and 2 deletions

View File

@@ -18,6 +18,7 @@
#include "libcef_dll/ctocpp/display_handler_ctocpp.h"
#include "libcef_dll/ctocpp/download_handler_ctocpp.h"
#include "libcef_dll/ctocpp/drag_handler_ctocpp.h"
#include "libcef_dll/ctocpp/find_handler_ctocpp.h"
#include "libcef_dll/ctocpp/focus_handler_ctocpp.h"
#include "libcef_dll/ctocpp/geolocation_handler_ctocpp.h"
#include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h"
@@ -96,6 +97,19 @@ CefRefPtr<CefDragHandler> CefClientCToCpp::GetDragHandler() {
return CefDragHandlerCToCpp::Wrap(_retval);
}
CefRefPtr<CefFindHandler> CefClientCToCpp::GetFindHandler() {
if (CEF_MEMBER_MISSING(struct_, get_find_handler))
return NULL;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Execute
cef_find_handler_t* _retval = struct_->get_find_handler(struct_);
// Return type: refptr_same
return CefFindHandlerCToCpp::Wrap(_retval);
}
CefRefPtr<CefFocusHandler> CefClientCToCpp::GetFocusHandler() {
if (CEF_MEMBER_MISSING(struct_, get_focus_handler))
return NULL;

View File

@@ -36,6 +36,7 @@ class CefClientCToCpp
CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
CefRefPtr<CefDownloadHandler> GetDownloadHandler() override;
CefRefPtr<CefDragHandler> GetDragHandler() override;
CefRefPtr<CefFindHandler> GetFindHandler() override;
CefRefPtr<CefFocusHandler> GetFocusHandler() override;
CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() override;
CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() override;

View File

@@ -0,0 +1,47 @@
// Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
//
// ---------------------------------------------------------------------------
//
// This file was generated by the CEF translator tool. If making changes by
// hand only do so within the body of existing method and function
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
#include "libcef_dll/cpptoc/browser_cpptoc.h"
#include "libcef_dll/ctocpp/find_handler_ctocpp.h"
// VIRTUAL METHODS - Body may be edited by hand.
void CefFindHandlerCToCpp::OnFindResult(CefRefPtr<CefBrowser> browser,
int identifier, int count, const CefRect& selectionRect,
int activeMatchOrdinal, bool finalUpdate) {
if (CEF_MEMBER_MISSING(struct_, on_find_result))
return;
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Verify param: browser; type: refptr_diff
DCHECK(browser.get());
if (!browser.get())
return;
// Execute
struct_->on_find_result(struct_,
CefBrowserCppToC::Wrap(browser),
identifier,
count,
&selectionRect,
activeMatchOrdinal,
finalUpdate);
}
#ifndef NDEBUG
template<> base::AtomicRefCount CefCToCpp<CefFindHandlerCToCpp, CefFindHandler,
cef_find_handler_t>::DebugObjCt = 0;
#endif

View File

@@ -0,0 +1,43 @@
// Copyright (c) 2015 The Chromium Embedded Framework Authors. All rights
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
//
// ---------------------------------------------------------------------------
//
// This file was generated by the CEF translator tool. If making changes by
// hand only do so within the body of existing method and function
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
#ifndef CEF_LIBCEF_DLL_CTOCPP_FIND_HANDLER_CTOCPP_H_
#define CEF_LIBCEF_DLL_CTOCPP_FIND_HANDLER_CTOCPP_H_
#pragma once
#ifndef BUILDING_CEF_SHARED
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
#else // BUILDING_CEF_SHARED
#include "include/cef_find_handler.h"
#include "include/capi/cef_find_handler_capi.h"
#include "libcef_dll/ctocpp/ctocpp.h"
// Wrap a C structure with a C++ class.
// This class may be instantiated and accessed DLL-side only.
class CefFindHandlerCToCpp
: public CefCToCpp<CefFindHandlerCToCpp, CefFindHandler,
cef_find_handler_t> {
public:
explicit CefFindHandlerCToCpp(cef_find_handler_t* str)
: CefCToCpp<CefFindHandlerCToCpp, CefFindHandler, cef_find_handler_t>(
str) {}
// CefFindHandler methods
void OnFindResult(CefRefPtr<CefBrowser> browser, int identifier, int count,
const CefRect& selectionRect, int activeMatchOrdinal,
bool finalUpdate) override;
};
#endif // BUILDING_CEF_SHARED
#endif // CEF_LIBCEF_DLL_CTOCPP_FIND_HANDLER_CTOCPP_H_