| Index: extensions/browser/api/app_window/app_window_api.cc
|
| diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc
|
| index 4201c11ed1ae7a69fd5d991be45f46d4ee73e1ae..ec64436fa9b3a64260067e9fc3f9423ed492b6b1 100644
|
| --- a/extensions/browser/api/app_window/app_window_api.cc
|
| +++ b/extensions/browser/api/app_window/app_window_api.cc
|
| @@ -76,7 +76,7 @@ bool CheckBoundsConflict(const scoped_ptr<int>& inner_property,
|
| std::vector<std::string> subst;
|
| subst.push_back(property_name);
|
| *error = ReplaceStringPlaceholders(
|
| - app_window_constants::kConflictingBoundsOptions, subst, NULL);
|
| + app_window_constants::kConflictingBoundsOptions, subst, nullptr);
|
| return false;
|
| }
|
|
|
|
|