summaryrefslogtreecommitdiffstats
path: root/ui/views/view_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 20:52:52 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-08 20:52:52 +0000
commit875d83611df7fe24b61233eb6acad0a52c7feec2 (patch)
treef6bd1773165979f1d04ed4f543de425354b03c7c /ui/views/view_unittest.cc
parent17bc45d8acff61aa045ccff6521a310b827f0abf (diff)
downloadchromium_src-875d83611df7fe24b61233eb6acad0a52c7feec2.zip
chromium_src-875d83611df7fe24b61233eb6acad0a52c7feec2.tar.gz
chromium_src-875d83611df7fe24b61233eb6acad0a52c7feec2.tar.bz2
ui/views: Fix the signature of View::OnViewAdded/Removed overridden methods.
The signature changed from (commit bf2f7326): virtual void OnViewAdded(View* parent, View* child); To: virtual void OnViewAdded(const View& parent, const View& child); BUG=72040 TEST=None R=ben@chromium.org,sky@chromium.org,pkasting@chromium.org Review URL: http://codereview.chromium.org/7104042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88392 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_unittest.cc')
-rw-r--r--ui/views/view_unittest.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 202b223..ebdc717 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -4,6 +4,7 @@
#include <algorithm>
+#include "base/compiler_specific.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/canvas.h"
#include "ui/views/view.h"
@@ -69,15 +70,15 @@ class ObserverView : public View {
}
// Overridden from View:
- virtual void OnViewAdded(View* parent, View* child) {
- subject_view_ = child;
+ virtual void OnViewAdded(const View& parent, const View& child) OVERRIDE {
view_added_ = true;
view_removed_ = false;
+ subject_view_ = &child;
}
- virtual void OnViewRemoved(View* parent, View* child) {
- subject_view_ = child;
- view_removed_ = true;
+ virtual void OnViewRemoved(const View& parent, const View& child) OVERRIDE {
view_added_ = false;
+ view_removed_ = true;
+ subject_view_ = &child;
}
bool view_added() const { return view_added_; }