diff --git a/tests/cefsimple/cefsimple_linux.cc b/tests/cefsimple/cefsimple_linux.cc index e67ed2631..87efbb79d 100644 --- a/tests/cefsimple/cefsimple_linux.cc +++ b/tests/cefsimple/cefsimple_linux.cc @@ -39,7 +39,7 @@ int main(int argc, char* argv[]) { // CEF applications have multiple sub-processes (render, plugin, GPU, etc) // that share the same executable. This function checks the command-line and, // if this is a sub-process, executes the appropriate logic. - int exit_code = CefExecuteProcess(main_args, NULL, NULL); + int exit_code = CefExecuteProcess(main_args, nullptr, nullptr); if (exit_code >= 0) { // The sub-process has completed so return here. return exit_code; @@ -68,7 +68,7 @@ int main(int argc, char* argv[]) { CefRefPtr app(new SimpleApp); // Initialize CEF for the browser process. - CefInitialize(main_args, settings, app.get(), NULL); + CefInitialize(main_args, settings, app.get(), nullptr); // Run the CEF message loop. This will block until CefQuitMessageLoop() is // called. diff --git a/tests/cefsimple/cefsimple_win.cc b/tests/cefsimple/cefsimple_win.cc index 1e9af869d..14fe5e1b8 100644 --- a/tests/cefsimple/cefsimple_win.cc +++ b/tests/cefsimple/cefsimple_win.cc @@ -30,7 +30,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, // Enable High-DPI support on Windows 7 or newer. CefEnableHighDPISupport(); - void* sandbox_info = NULL; + void* sandbox_info = nullptr; #if defined(CEF_USE_SANDBOX) // Manage the life span of the sandbox information object. This is necessary @@ -45,7 +45,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, // CEF applications have multiple sub-processes (render, plugin, GPU, etc) // that share the same executable. This function checks the command-line and, // if this is a sub-process, executes the appropriate logic. - int exit_code = CefExecuteProcess(main_args, NULL, sandbox_info); + int exit_code = CefExecuteProcess(main_args, nullptr, sandbox_info); if (exit_code >= 0) { // The sub-process has completed so return here. return exit_code; diff --git a/tests/cefsimple/process_helper_mac.cc b/tests/cefsimple/process_helper_mac.cc index f1f42c337..224593dd5 100644 --- a/tests/cefsimple/process_helper_mac.cc +++ b/tests/cefsimple/process_helper_mac.cc @@ -31,5 +31,5 @@ int main(int argc, char* argv[]) { CefMainArgs main_args(argc, argv); // Execute the sub-process. - return CefExecuteProcess(main_args, NULL, NULL); + return CefExecuteProcess(main_args, nullptr, nullptr); } diff --git a/tests/cefsimple/simple_app.cc b/tests/cefsimple/simple_app.cc index 289da9455..e9c8a5f0e 100644 --- a/tests/cefsimple/simple_app.cc +++ b/tests/cefsimple/simple_app.cc @@ -32,7 +32,7 @@ class SimpleWindowDelegate : public CefWindowDelegate { } void OnWindowDestroyed(CefRefPtr window) OVERRIDE { - browser_view_ = NULL; + browser_view_ = nullptr; } bool CanClose(CefRefPtr window) OVERRIDE { @@ -91,7 +91,7 @@ void SimpleApp::OnContextInitialized() { if (use_views) { // Create the BrowserView. CefRefPtr browser_view = CefBrowserView::CreateBrowserView( - handler, url, browser_settings, NULL, NULL, NULL); + handler, url, browser_settings, nullptr, nullptr, nullptr); // Create the Window. It will show itself after creation. CefWindow::CreateTopLevelWindow(new SimpleWindowDelegate(browser_view)); @@ -107,6 +107,6 @@ void SimpleApp::OnContextInitialized() { // Create the first browser window. CefBrowserHost::CreateBrowser(window_info, handler, url, browser_settings, - NULL, NULL); + nullptr, nullptr); } } diff --git a/tests/cefsimple/simple_handler.cc b/tests/cefsimple/simple_handler.cc index 352622a5d..fafedc85d 100644 --- a/tests/cefsimple/simple_handler.cc +++ b/tests/cefsimple/simple_handler.cc @@ -17,7 +17,7 @@ namespace { -SimpleHandler* g_instance = NULL; +SimpleHandler* g_instance = nullptr; // Returns a data: URI with the specified contents. std::string GetDataURI(const std::string& data, const std::string& mime_type) { @@ -35,7 +35,7 @@ SimpleHandler::SimpleHandler(bool use_views) } SimpleHandler::~SimpleHandler() { - g_instance = NULL; + g_instance = nullptr; } // static