mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

NULL => nullptr

Browse source
This commit is contained in:
Cheng Zhao 2015-04-26 12:35:14 +08:00
parent b527846ee4
commit d8adbc0875
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/atom_browser_client.cc
View file

@ -49,7 +49,7 @@ struct FindByProcessId {
} // namespace } // namespace
AtomBrowserClient::AtomBrowserClient() AtomBrowserClient::AtomBrowserClient()
: dying_render_process_(NULL) { : dying_render_process_(nullptr) {
} }
AtomBrowserClient::~AtomBrowserClient() { AtomBrowserClient::~AtomBrowserClient() {
@ -139,7 +139,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line, base::CommandLine* command_line,
int child_process_id) { int child_process_id) {
WindowList* list = WindowList::GetInstance(); WindowList* list = WindowList::GetInstance();
NativeWindow* window = NULL; NativeWindow* window = nullptr;
// Find the owner of this child process. // Find the owner of this child process.
WindowList::const_iterator iter = std::find_if( WindowList::const_iterator iter = std::find_if(
@ -150,7 +150,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
// If the render process is a newly started one, which means the window still // If the render process is a newly started one, which means the window still
// uses the old going-to-be-swapped render process, then we try to find the // uses the old going-to-be-swapped render process, then we try to find the
// window from the swapped render process. // window from the swapped render process.
if (window == NULL && dying_render_process_ != NULL) { if (!window && dying_render_process_) {
child_process_id = dying_render_process_->GetID(); child_process_id = dying_render_process_->GetID();
WindowList::const_iterator iter = std::find_if( WindowList::const_iterator iter = std::find_if(
list->begin(), list->end(), FindByProcessId(child_process_id)); list->begin(), list->end(), FindByProcessId(child_process_id));
@ -158,7 +158,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
window = *iter; window = *iter;
} }
if (window != NULL) { if (window) {
window->AppendExtraCommandLineSwitches(command_line, child_process_id); window->AppendExtraCommandLineSwitches(command_line, child_process_id);
} else { } else {
// Append commnad line arguments for guest web view. // Append commnad line arguments for guest web view.
@ -180,7 +180,7 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
} }
} }
dying_render_process_ = NULL; dying_render_process_ = nullptr;
} }
brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts( brightray::BrowserMainParts* AtomBrowserClient::OverrideCreateBrowserMainParts(