| Index: chrome/browser/ui/libgtkui/gtk_util.cc
|
| diff --git a/chrome/browser/ui/libgtkui/gtk_util.cc b/chrome/browser/ui/libgtkui/gtk_util.cc
|
| index a17fd4ba0a0da527762f12780751685e8203ca34..9463d533c50e19d1713d63b5152226d48638b88e 100644
|
| --- a/chrome/browser/ui/libgtkui/gtk_util.cc
|
| +++ b/chrome/browser/ui/libgtkui/gtk_util.cc
|
| @@ -40,7 +40,7 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line,
|
| // here.
|
| argv[i] = strdup(args[i].c_str());
|
| }
|
| - argv[argc] = NULL;
|
| + argv[argc] = nullptr;
|
| char** argv_pointer = argv.get();
|
|
|
| {
|
| @@ -203,7 +203,7 @@ aura::Window* GetAuraTransientParent(GtkWidget* dialog) {
|
| }
|
|
|
| void ClearAuraTransientParent(GtkWidget* dialog) {
|
| - g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL);
|
| + g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, nullptr);
|
| }
|
|
|
| #if GTK_MAJOR_VERSION > 2
|
|
|