cefsimple: Convert NULL to nullptr (see issue #2861)
This commit is contained in:
parent
f5eef5390a
commit
b785d34d29
|
@ -39,7 +39,7 @@ int main(int argc, char* argv[]) {
|
||||||
// CEF applications have multiple sub-processes (render, plugin, GPU, etc)
|
// CEF applications have multiple sub-processes (render, plugin, GPU, etc)
|
||||||
// that share the same executable. This function checks the command-line and,
|
// that share the same executable. This function checks the command-line and,
|
||||||
// if this is a sub-process, executes the appropriate logic.
|
// 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) {
|
if (exit_code >= 0) {
|
||||||
// The sub-process has completed so return here.
|
// The sub-process has completed so return here.
|
||||||
return exit_code;
|
return exit_code;
|
||||||
|
@ -68,7 +68,7 @@ int main(int argc, char* argv[]) {
|
||||||
CefRefPtr<SimpleApp> app(new SimpleApp);
|
CefRefPtr<SimpleApp> app(new SimpleApp);
|
||||||
|
|
||||||
// Initialize CEF for the browser process.
|
// 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
|
// Run the CEF message loop. This will block until CefQuitMessageLoop() is
|
||||||
// called.
|
// called.
|
||||||
|
|
|
@ -30,7 +30,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
|
||||||
// Enable High-DPI support on Windows 7 or newer.
|
// Enable High-DPI support on Windows 7 or newer.
|
||||||
CefEnableHighDPISupport();
|
CefEnableHighDPISupport();
|
||||||
|
|
||||||
void* sandbox_info = NULL;
|
void* sandbox_info = nullptr;
|
||||||
|
|
||||||
#if defined(CEF_USE_SANDBOX)
|
#if defined(CEF_USE_SANDBOX)
|
||||||
// Manage the life span of the sandbox information object. This is necessary
|
// 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)
|
// CEF applications have multiple sub-processes (render, plugin, GPU, etc)
|
||||||
// that share the same executable. This function checks the command-line and,
|
// that share the same executable. This function checks the command-line and,
|
||||||
// if this is a sub-process, executes the appropriate logic.
|
// 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) {
|
if (exit_code >= 0) {
|
||||||
// The sub-process has completed so return here.
|
// The sub-process has completed so return here.
|
||||||
return exit_code;
|
return exit_code;
|
||||||
|
|
|
@ -31,5 +31,5 @@ int main(int argc, char* argv[]) {
|
||||||
CefMainArgs main_args(argc, argv);
|
CefMainArgs main_args(argc, argv);
|
||||||
|
|
||||||
// Execute the sub-process.
|
// Execute the sub-process.
|
||||||
return CefExecuteProcess(main_args, NULL, NULL);
|
return CefExecuteProcess(main_args, nullptr, nullptr);
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ class SimpleWindowDelegate : public CefWindowDelegate {
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnWindowDestroyed(CefRefPtr<CefWindow> window) OVERRIDE {
|
void OnWindowDestroyed(CefRefPtr<CefWindow> window) OVERRIDE {
|
||||||
browser_view_ = NULL;
|
browser_view_ = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CanClose(CefRefPtr<CefWindow> window) OVERRIDE {
|
bool CanClose(CefRefPtr<CefWindow> window) OVERRIDE {
|
||||||
|
@ -91,7 +91,7 @@ void SimpleApp::OnContextInitialized() {
|
||||||
if (use_views) {
|
if (use_views) {
|
||||||
// Create the BrowserView.
|
// Create the BrowserView.
|
||||||
CefRefPtr<CefBrowserView> browser_view = CefBrowserView::CreateBrowserView(
|
CefRefPtr<CefBrowserView> 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.
|
// Create the Window. It will show itself after creation.
|
||||||
CefWindow::CreateTopLevelWindow(new SimpleWindowDelegate(browser_view));
|
CefWindow::CreateTopLevelWindow(new SimpleWindowDelegate(browser_view));
|
||||||
|
@ -107,6 +107,6 @@ void SimpleApp::OnContextInitialized() {
|
||||||
|
|
||||||
// Create the first browser window.
|
// Create the first browser window.
|
||||||
CefBrowserHost::CreateBrowser(window_info, handler, url, browser_settings,
|
CefBrowserHost::CreateBrowser(window_info, handler, url, browser_settings,
|
||||||
NULL, NULL);
|
nullptr, nullptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
SimpleHandler* g_instance = NULL;
|
SimpleHandler* g_instance = nullptr;
|
||||||
|
|
||||||
// Returns a data: URI with the specified contents.
|
// Returns a data: URI with the specified contents.
|
||||||
std::string GetDataURI(const std::string& data, const std::string& mime_type) {
|
std::string GetDataURI(const std::string& data, const std::string& mime_type) {
|
||||||
|
@ -35,7 +35,7 @@ SimpleHandler::SimpleHandler(bool use_views)
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleHandler::~SimpleHandler() {
|
SimpleHandler::~SimpleHandler() {
|
||||||
g_instance = NULL;
|
g_instance = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
// static
|
// static
|
||||||
|
|
Loading…
Reference in New Issue