mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-10 09:13:33 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
84 lines
2.5 KiB
C++
84 lines
2.5 KiB
C++
// Copyright (c) 2011 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.
|
|
|
|
#include "cefclient/client_handler.h"
|
|
|
|
#include <string>
|
|
#include <windows.h>
|
|
#include <shlobj.h>
|
|
|
|
#include "include/cef_browser.h"
|
|
#include "include/cef_frame.h"
|
|
#include "cefclient/resource.h"
|
|
|
|
void ClientHandler::OnAddressChange(CefRefPtr<CefBrowser> browser,
|
|
CefRefPtr<CefFrame> frame,
|
|
const CefString& url) {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
if (GetBrowserId() == browser->GetIdentifier() && frame->IsMain()) {
|
|
// Set the edit window text
|
|
SetWindowText(edit_handle_, std::wstring(url).c_str());
|
|
}
|
|
}
|
|
|
|
void ClientHandler::OnTitleChange(CefRefPtr<CefBrowser> browser,
|
|
const CefString& title) {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
// Set the frame window title bar
|
|
CefWindowHandle hwnd = browser->GetHost()->GetWindowHandle();
|
|
if (GetBrowserId() == browser->GetIdentifier()) {
|
|
// The frame window will be the parent of the browser window
|
|
hwnd = GetParent(hwnd);
|
|
}
|
|
SetWindowText(hwnd, std::wstring(title).c_str());
|
|
}
|
|
|
|
void ClientHandler::SendNotification(NotificationType type) {
|
|
UINT id;
|
|
switch (type) {
|
|
case NOTIFY_CONSOLE_MESSAGE:
|
|
id = ID_WARN_CONSOLEMESSAGE;
|
|
break;
|
|
case NOTIFY_DOWNLOAD_COMPLETE:
|
|
id = ID_WARN_DOWNLOADCOMPLETE;
|
|
break;
|
|
case NOTIFY_DOWNLOAD_ERROR:
|
|
id = ID_WARN_DOWNLOADERROR;
|
|
break;
|
|
default:
|
|
return;
|
|
}
|
|
PostMessage(main_handle_, WM_COMMAND, id, 0);
|
|
}
|
|
|
|
void ClientHandler::SetLoading(bool isLoading) {
|
|
DCHECK(edit_handle_ != NULL && reload_handle_ != NULL &&
|
|
stop_handle_ != NULL);
|
|
EnableWindow(edit_handle_, TRUE);
|
|
EnableWindow(reload_handle_, !isLoading);
|
|
EnableWindow(stop_handle_, isLoading);
|
|
}
|
|
|
|
void ClientHandler::SetNavState(bool canGoBack, bool canGoForward) {
|
|
DCHECK(back_handle_ != NULL && forward_handle_ != NULL);
|
|
EnableWindow(back_handle_, canGoBack);
|
|
EnableWindow(forward_handle_, canGoForward);
|
|
}
|
|
|
|
std::string ClientHandler::GetDownloadPath(const std::string& file_name) {
|
|
TCHAR szFolderPath[MAX_PATH];
|
|
std::string path;
|
|
|
|
// Save the file in the user's "My Documents" folder.
|
|
if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE,
|
|
NULL, 0, szFolderPath))) {
|
|
path = CefString(szFolderPath);
|
|
path += "\\" + file_name;
|
|
}
|
|
|
|
return path;
|
|
}
|