From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/base/view_prop.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'chromium/ui/base/view_prop.cc') diff --git a/chromium/ui/base/view_prop.cc b/chromium/ui/base/view_prop.cc index 45185f5ffbe..33b38a2ff04 100644 --- a/chromium/ui/base/view_prop.cc +++ b/chromium/ui/base/view_prop.cc @@ -53,9 +53,7 @@ class ViewProp::Data : public base::RefCounted { typedef std::set DataSet; Data(gfx::AcceleratedWidget view, const char* key) - : view_(view), - key_(key), - data_(NULL) {} + : view_(view), key_(key), data_(nullptr) {} ~Data() { auto i = data_set_->find(this); -- cgit v1.2.1