bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

cefclient: Simplify tests and related resource loading.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1174 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-04-04 00:10:53 +00:00
parent 64b570a994
commit da41e8e585
23 changed files with 37 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/cefclient/client_handler.cpp
View File

@ -21,7 +21,6 @@
#include "cefclient/client_switches.h"
#include "cefclient/dialog_test.h"
#include "cefclient/dom_test.h"
#include "cefclient/performance_test.h"
#include "cefclient/resource_util.h"
#include "cefclient/string_util.h"
#include "cefclient/window_test.h"
@ -96,7 +95,6 @@ ClientHandler::ClientHandler()
m_ReloadHwnd(NULL),
m_bFocusOnEditableField(false) {
CreateProcessMessageDelegates(process_message_delegates_);
CreateRequestDelegates(request_delegates_);
// Read command line settings.
CefRefPtr<CefCommandLine> command_line =
@ -465,14 +463,7 @@ CefRefPtr<CefResourceHandler> ClientHandler::GetResourceHandler(
}
}
CefRefPtr<CefResourceHandler> handler;
// Execute delegate callbacks.
RequestDelegateSet::iterator it = request_delegates_.begin();
for (; it != request_delegates_.end() && !handler.get(); ++it)
handler = (*it)->GetResourceHandler(this, browser, frame, request);
return handler;
return NULL;
}
bool ClientHandler::OnQuotaRequest(CefRefPtr<CefBrowser> browser,
@ -741,18 +732,6 @@ void ClientHandler::CreateProcessMessageDelegates(
window_test::CreateProcessMessageDelegates(delegates);
}
// static
void ClientHandler::CreateRequestDelegates(RequestDelegateSet& delegates) {
// Create the binding test delegates.
binding_test::CreateRequestDelegates(delegates);
// Create the performance test delegates.
performance_test::CreateRequestDelegates(delegates);
// Create the window test delegates.
window_test::CreateRequestDelegates(delegates);
}
void ClientHandler::BuildTestMenu(CefRefPtr<CefMenuModel> model) {
if (model->GetCount() > 0)
model->AddSeparator();