From 3ebea920942e11fb0c81c83718699ab4e6a6a370 Mon Sep 17 00:00:00 2001 From: "derat@chromium.org" Date: Thu, 19 Jul 2012 00:38:58 +0000 Subject: base: Make ScopedVector::clear() destroy elements. This makes ScopedVector's clear() method destroy the elements before clearing the internal vector, matching the behavior of the erase() method. I'm moving clear()'s previous element-preserving behavior into a new weak_clear() method, matching weak_erase(). I'm also removing ScopedVector::reset(), as it duplicated clear()'s new behavior and isn't a part of std::vector. BUG=137909 TEST=added Review URL: https://chromiumcodereview.appspot.com/10797017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147360 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/controls/native_control_win.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/views/controls/native_control_win.cc') diff --git a/ui/views/controls/native_control_win.cc b/ui/views/controls/native_control_win.cc index 25278411..a1c600b 100644 --- a/ui/views/controls/native_control_win.cc +++ b/ui/views/controls/native_control_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -215,7 +215,7 @@ LRESULT NativeControlWin::NativeControlWndProc(HWND window, NOTREACHED(); } } else if (message == WM_DESTROY) { - native_control->props_.reset(); + native_control->props_.clear(); ui::SetWindowProc(window, native_control->original_wndproc_); } -- cgit v1.1