Significant API changes for issue #218:

- Replace CefHandler with a new CefClient interface and separate handler interfaces.
- Add support for virtual inheritance to allow multiple CefBase parented interfaces to be implemented in the same class.
- Replace CefThreadSafeBase with IMPLEMENT_* macros to support virtual inheritance and to only provide locking implementations when needed.
- Move the CefBrowserSettings parameter from CefInitialize to CreateBrowser.
- Add a new cef_build.h header that provides platform-specific and OS_* defines.
- Introduce the use of OVERRIDE to generate compiler errors on Windows if a child virtual method declaration doesn't match the parent declaration.
- Use NDEBUG instead of _DEBUG because _DEBUG is not defined on Mac. (issue #240).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@235 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

tests/cefclient/cefclient_win.cpp

@@ -3,14 +3,13 @@
 // can be found in the LICENSE file.
 
 #include "include/cef.h"
-#include "include/cef_wrapper.h"
 #include "cefclient.h"
 #include "binding_test.h"
+#include "client_handler.h"
 #include "extension_test.h"
 #include "osrplugin_test.h"
 #include "plugin_test.h"
 #include "resource.h"
-#include "resource_util.h"
 #include "scheme_test.h"
 #include "string_util.h"
 #include "uiplugin_test.h"
@@ -45,7 +44,7 @@ INT_PTR CALLBACK	About(HWND, UINT, WPARAM, LPARAM);
 // The global ClientHandler reference.
 extern CefRefPtr<ClientHandler> g_handler;
 
-#ifdef _WIN32
+#if defined(OS_WIN)
 // Add Common Controls to the application manifest because it's required to
 // support the default tooltip implementation.
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
@@ -65,12 +64,11 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
     szWorkingDir[0] = 0;
 
   CefSettings settings;
-  CefBrowserSettings browserDefaults;
 
   // Specify a cache path value.
   //CefString(&settings.cache_path).FromASCII("c:\\temp\\cache");
 
-#ifndef _DEBUG
+#ifdef NDEBUG
   // Only log error messages and higher in release build.
   settings.log_severity = LOGSEVERITY_ERROR;
 #endif
@@ -84,7 +82,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
   settings.multi_threaded_message_loop = true;
 #endif
 
-  CefInitialize(settings, browserDefaults);
+  CefInitialize(settings);
 
   // Register the internal client plugin.
   InitPluginTest();
@@ -368,14 +366,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         rect.top += URLBAR_HEIGHT;
          
         CefWindowInfo info;
+        CefBrowserSettings settings;
 
         // Initialize window info to the defaults for a child window
         info.SetAsChild(hWnd, rect);
 
         // Creat the new child child browser window
-        CefBrowser::CreateBrowser(info, false,
-            static_cast<CefRefPtr<CefHandler> >(g_handler),
-            "http://www.google.com");
+        CefBrowser::CreateBrowser(info,
+            static_cast<CefRefPtr<CefClient> >(g_handler),
+            "http://www.google.com", settings);
       }
       return 0;
 
@@ -639,149 +638,6 @@ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 
-// ClientHandler implementation
-
-CefHandler::RetVal ClientHandler::HandleBeforeCreated(
-    CefRefPtr<CefBrowser> parentBrowser, CefWindowInfo& createInfo, bool popup,
-    const CefPopupFeatures& popupFeatures, CefRefPtr<CefHandler>& handler,
-    const CefString& url, CefBrowserSettings& settings)
-{
-  REQUIRE_UI_THREAD();
-
-#ifdef TEST_REDIRECT_POPUP_URLS
-  if(popup) {
-    std::string urlStr = url;
-    if(urlStr.find("resources/inspector/devtools.html") == std::string::npos) {
-      // Show all popup windows excluding DevTools in the current window.
-      createInfo.m_dwStyle &= ~WS_VISIBLE;
-      handler = new ClientPopupHandler(m_Browser);
-    }
-  }
-#endif // TEST_REDIRECT_POPUP_URLS
-
-  return RV_CONTINUE;
-}
-
-CefHandler::RetVal ClientHandler::HandleAddressChange(
-    CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
-    const CefString& url)
-{
-  REQUIRE_UI_THREAD();
-
-  if(m_BrowserHwnd == browser->GetWindowHandle() && frame->IsMain())
-  {
-    // Set the edit window text
-    SetWindowText(m_EditHwnd, std::wstring(url).c_str());
-  }
-  return RV_CONTINUE;
-}
-
-CefHandler::RetVal ClientHandler::HandleTitleChange(
-    CefRefPtr<CefBrowser> browser, const CefString& title)
-{
-  REQUIRE_UI_THREAD();
-
-  // Set the frame window title bar
-  CefWindowHandle hwnd = browser->GetWindowHandle();
-  if(!browser->IsPopup())
-  {
-    // The frame window will be the parent of the browser window
-    hwnd = GetParent(hwnd);
-  }
-  SetWindowText(hwnd, std::wstring(title).c_str());
-  return RV_CONTINUE;
-}
-
-CefHandler::RetVal ClientHandler::HandleBeforeResourceLoad(
-    CefRefPtr<CefBrowser> browser, CefRefPtr<CefRequest> request,
-    CefString& redirectUrl, CefRefPtr<CefStreamReader>& resourceStream,
-    CefRefPtr<CefResponse> response, int loadFlags)
-{
-  REQUIRE_IO_THREAD();
-
-  std::string url = request->GetURL();
-  if(url == "http://tests/request") {
-    // Show the request contents
-    std::string dump;
-    DumpRequestContents(request, dump);
-    resourceStream =
-        CefStreamReader::CreateForData((void*)dump.c_str(), dump.size());
-    response->SetMimeType("text/plain");
-    response->SetStatus(200);
-  } else if(strstr(url.c_str(), "/ps_logo2.png") != NULL) {
-    // Any time we find "ps_logo2.png" in the URL substitute in our own image
-    resourceStream = GetBinaryResourceReader(IDS_LOGO);
-    response->SetMimeType("image/png");
-    response->SetStatus(200);
-  } else if(url == "http://tests/uiapp") {
-    // Show the uiapp contents
-    resourceStream = GetBinaryResourceReader(IDS_UIPLUGIN);
-    response->SetMimeType("text/html");
-    response->SetStatus(200);
-  } else if(url == "http://tests/osrapp") {
-    // Show the osrapp contents
-    resourceStream = GetBinaryResourceReader(IDS_OSRPLUGIN);
-    response->SetMimeType("text/html");
-    response->SetStatus(200);
-  } else if(url == "http://tests/localstorage") {
-    // Show the localstorage contents
-    resourceStream = GetBinaryResourceReader(IDS_LOCALSTORAGE);
-    response->SetMimeType("text/html");
-    response->SetStatus(200);
-  } else if(url == "http://tests/xmlhttprequest") {
-    // Show the xmlhttprequest HTML contents
-    resourceStream = GetBinaryResourceReader(IDS_XMLHTTPREQUEST);
-    response->SetMimeType("text/html");
-    response->SetStatus(200);
-  } else if(url == "http://tests/domaccess") {
-    // Show the domaccess HTML contents
-    resourceStream = GetBinaryResourceReader(IDS_DOMACCESS);
-    response->SetMimeType("text/html");
-    response->SetStatus(200);
-  } else if(strstr(url.c_str(), "/logoball.png") != NULL) {
-    // Load the "logoball.png" image resource.
-    resourceStream = GetBinaryResourceReader(IDS_LOGOBALL);
-    response->SetMimeType("image/png");
-    response->SetStatus(200);
-  }
-  return RV_CONTINUE;
-}
-
-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(m_MainHwnd, WM_COMMAND, id, 0);
-}
-
-void ClientHandler::SetLoading(bool isLoading)
-{
-  ASSERT(m_EditHwnd != NULL && m_ReloadHwnd != NULL && m_StopHwnd != NULL);
-  EnableWindow(m_EditHwnd, TRUE);
-  EnableWindow(m_ReloadHwnd, !isLoading);
-  EnableWindow(m_StopHwnd, isLoading);
-}
-
-void ClientHandler::SetNavState(bool canGoBack, bool canGoForward)
-{
-  ASSERT(m_BackHwnd != NULL && m_ForwardHwnd != NULL);
-  EnableWindow(m_BackHwnd, canGoBack);
-  EnableWindow(m_ForwardHwnd, canGoForward);
-}
-
 // Global functions
 
 std::string AppGetWorkingDirectory()