Add setting "chrome.runtime_style" and improve main window logic.

By default runtime style is `alloy`. Alternative runtime style is `chrome`
which provides more features and looks similar to native Chromium.

Author: cztomczak

cef/app.cpp

@@ -16,6 +16,10 @@
 #include "client_handler.h"
 #include "../settings.h"
 #include "javascript_api.h"
+#include "../main_window.h"
+#include "../executable.h"
+
+extern HINSTANCE g_hInstance; // main.cpp
 
 // ----------------------------------------------------------------------------
 // CefRenderProcessHandler methods
@@ -58,7 +62,7 @@ void App::OnContextCreated(CefRefPtr<CefBrowser> browser,
                             CefRefPtr<CefFrame> frame,
                             CefRefPtr<CefV8Context> context) {
     // RENDERER PROCESS.
-    LOGGER_DEBUG << "OnContextCreated()";
+    LOGGER_DEBUG << "V8 context created";
     CefRefPtr<CefV8Value> window = context->GetGlobal();
     CefRefPtr<CefV8Handler> handler = GetJavascriptApi(browser);
     if (!handler.get()) {
@@ -174,7 +178,14 @@ void App::OnBeforeCommandLineProcessing(
 // has been initialized.
 ///
 void App::OnContextInitialized() {
-  REQUIRE_UI_THREAD();
-  LOGGER_DEBUG << "App::OnContextInitialized()";
-}
+    REQUIRE_UI_THREAD();
+    LOGGER_DEBUG << "App context initialized";
 
+    // Create main window
+    json_value* appSettings = GetApplicationSettings();
+    std::string main_window_title = (*appSettings)["main_window"]["title"];
+    if (main_window_title.empty()) {
+        main_window_title = GetExecutableName();
+    }
+    CreateMainWindow(g_hInstance, SW_SHOWDEFAULT, main_window_title);
+}

cef/browser_window.cpp

@@ -55,17 +55,17 @@ BrowserWindow* GetBrowserWindow(HWND hwnd) {
     }
     // GetBrowserWindow() may fail during window creation, so log
     // severity is only DEBUG.
-    LOGGER_DEBUG << "GetBrowserWindow(): not found, hwnd = " << (uintptr_t) hwnd;
+    LOGGER_DEBUG << "Browser window not found, hwnd = " << (uintptr_t) hwnd;
     return NULL;
 }
 void StoreBrowserWindow(HWND hwnd, BrowserWindow* browser) {
-    LOGGER_DEBUG << "StoreBrowserWindow(): hwnd = " << (uintptr_t) hwnd;
+    LOGGER_DEBUG << "Store browser window, hwnd = " << (uintptr_t) hwnd;
     std::map<HWND, BrowserWindow*>::iterator it;
     it = g_browserWindows.find(hwnd);
     if (it == g_browserWindows.end()) {
         g_browserWindows[hwnd] = browser;
     } else {
-        LOGGER_WARNING << "StoreBrowserWindow() failed: already stored";
+        LOGGER_WARNING << "Storing browser window failed: already stored";
     }
 }
 void RemoveBrowserWindow(HWND hwnd) {
@@ -147,20 +147,30 @@ void BrowserWindow::SetCefBrowser(CefRefPtr<CefBrowser> cefBrowser) {
     this->OnSize();
 }
 bool BrowserWindow::CreateBrowserControl(const wchar_t* navigateUrl) {
-    LOGGER_DEBUG << "BrowserWindow::CreateBrowserControl()";
+    LOGGER_DEBUG << "Create main browser";
     // This is called only for the main window.
     // Popup cef browsers are created internally by CEF,
     // see OnBeforePopup, OnAfterCreated.
     RECT rect;
     BOOL b = GetWindowRect(windowHandle_, &rect);
     if (!b) {
-        LOGGER_ERROR << "GetWindowRect() failed in "
-                     "BrowserWindow::CreateBrowserControl()";
+        LOGGER_ERROR << "GetWindowRect() failed while creating browser";
     }
 
     // Information used when creating the native window.
+    json_value* settings = GetApplicationSettings();
+    std::string runtime_style = (*settings)["chrome"]["runtime_style"];
     CefWindowInfo window_info;
-    window_info.runtime_style = CEF_RUNTIME_STYLE_ALLOY;
+    if (runtime_style == "alloy") {
+        LOGGER_INFO << "Runtime style: alloy";
+        window_info.runtime_style = CEF_RUNTIME_STYLE_ALLOY;
+    } else if (runtime_style == "chrome") {
+        LOGGER_INFO << "Runtime style: chrome";
+        window_info.runtime_style = CEF_RUNTIME_STYLE_CHROME;
+    } else {
+        LOGGER_INFO << "Invalid runtime style in settings.json: " << runtime_style;
+        window_info.runtime_style = CEF_RUNTIME_STYLE_ALLOY;
+    }
     int width = rect.right - rect.left;
     int height = rect.bottom - rect.top;
     CefRect cef_rect(rect.left, rect.top, width, height);
@@ -169,7 +179,7 @@ bool BrowserWindow::CreateBrowserControl(const wchar_t* navigateUrl) {
     CefRefPtr<ClientHandler> handler(new ClientHandler());
     // Specify CEF browser settings here.
     CefBrowserSettings browser_settings;
-    // Create the first browser window.
+    // Create the first browser.
     CefBrowserHost::CreateBrowser(
             window_info, handler.get(),
             GetWebServerUrl(), browser_settings, nullptr, nullptr);

cef/client_handler.cpp

@@ -126,7 +126,7 @@ void ClientHandler::OnTitleChange(CefRefPtr<CefBrowser> cefBrowser,
 ///
 void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> cefBrowser) {
     REQUIRE_UI_THREAD();
-    LOGGER_DEBUG << "ClientHandler::OnAfterCreated()";
+    LOGGER_DEBUG << "Browser was created";
     json_value* appSettings = GetApplicationSettings();
     bool center_relative_to_parent = \
             (*appSettings)["popup_window"]["center_relative_to_parent"];
@@ -136,8 +136,7 @@ void ClientHandler::OnAfterCreated(CefRefPtr<CefBrowser> cefBrowser) {
         // This block of code gets called for Main window & Devtools window.
         ASSERT(!phpBrowser->GetCefBrowser().get());
         if (!phpBrowser->GetCefBrowser().get()) {
-            LOGGER_DEBUG << "SetCefBrowser() called in "
-                            "ClientHandler::OnAfterCreated()";
+            LOGGER_DEBUG << "Set browser for window";
             phpBrowser->SetCefBrowser(cefBrowser);
         }
     } else {

main.cpp

@@ -89,7 +89,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
             if (browser && browser->GetCefBrowser()) {
                 browser->OnSize();
             } else if (!browser) {
-                LOGGER_WARNING << "WindowProc() WM_SIZE: could not fetch BrowserWindow";
+                LOGGER_WARNING << "Event WM_SIZE: could not fetch browser window";
             }
             break;
         case WM_MOVE:
@@ -99,7 +99,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
             if (browser && browser->GetCefBrowser()) {
                 browser->GetCefBrowser()->GetHost()->NotifyMoveOrResizeStarted();
             } else if (!browser) {
-                LOGGER_WARNING << "WindowProc() WM_MOVE: could not fetch BrowserWindow";
+                LOGGER_WARNING << "Event WM_MOVE: could not fetch browser window";
             }
             return 0;
         case WM_CREATE:
@@ -142,8 +142,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
             } else {
                 // GetMinMaxInfo may fail during window creation, so
                 // log severity is only DEBUG.
-                LOGGER_DEBUG << "WindowProc(): event WM_GETMINMAXINFO: "
-                             "could not fetch BrowserWindow";
+                LOGGER_DEBUG << "Event WM_GETMINMAXINFO: could not fetch browser window";
             }
             break;
         case WM_SETFOCUS:
@@ -152,8 +151,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                 browser->SetFocus();
                 return 0;
             } else {
-                LOGGER_DEBUG << "WindowProc(): event WM_SETFOCUS: "
-                             "could not fetch BrowserWindow";
+                LOGGER_DEBUG << "Event WM_SETFOCUS: could not fetch browser window";
             }
             break;
         case WM_ERASEBKGND:
@@ -298,11 +296,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     LOGGER_INFO << "Log level = "
              << FILELog::ToString(FILELog::ReportingLevel());
 
-    // Main window title option.
-    std::string main_window_title = (*appSettings)["main_window"]["title"];
-    if (main_window_title.empty())
-        main_window_title = GetExecutableName();
-
     // Single instance guid option.
     const char* single_instance_guid =
             (*appSettings)["application"]["single_instance_guid"];
@@ -394,7 +387,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 #endif
 
     CefInitialize(main_args, cef_settings, app.get(), sandbox_info);
-    CreateMainWindow(hInstance, nCmdShow, main_window_title);
+    LOGGER_DEBUG << "nCmdShow=" << nCmdShow;
     CefRunMessageLoop();
     CefShutdown();
 

main_window.cpp

@@ -2,6 +2,7 @@
 // License: New BSD License.
 // Website: http://code.google.com/p/phpdesktop/
 
+#include "logger.h"
 #include "main_window.h"
 #include "settings.h"
 #include "dpi_aware.h"
@@ -11,7 +12,9 @@
 
 extern wchar_t g_windowClassName[256]; // main.cpp
 
-HWND CreateMainWindow(HINSTANCE hInstance, int nCmdShow, std::string title) {
+HWND CreateMainWindow(HINSTANCE hInstance, int nCmdShow, std::string title)
+{
+    LOGGER_INFO << "Create main window";
     json_value* appSettings = GetApplicationSettings();
     int default_width = static_cast<long>((*appSettings)["main_window"]["default_size"][0]);
     int default_height = static_cast<long>((*appSettings)["main_window"]["default_size"][1]);
@@ -66,5 +69,6 @@ HWND CreateMainWindow(HINSTANCE hInstance, int nCmdShow, std::string title) {
         ShowWindow(hwnd, nCmdShow);
     }
     UpdateWindow(hwnd);
+    LOGGER_INFO << "Main window was created, hwnd=" << (uintptr_t) hwnd;
     return hwnd;
 }

settings.json

@@ -48,6 +48,7 @@
         "reload_page_F5": true,
         "devtools_F12": true,
         "remote_debugging_port": 0,
+        "runtime_style": "alloy",
         "command_line_switches": {"disable-gpu": ""},
         "enable_downloads": true,
         "context_menu": {