diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 23:07:00 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 23:07:00 +0000 |
| commit | 3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9 (patch) | |
| tree | 3ce2aba0fd25d8b37d61e58ae437107594f36d39 /views/view_unittest.cc | |
| parent | 894b4a7c7323f0132f3a9611cfb71fa7eed223ad (diff) | |
| download | chromium_src-3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9.zip chromium_src-3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9.tar.gz chromium_src-3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9.tar.bz2 | |
Lands http://codereview.chromium.org/449003/show for Thiago:
views: replace the deprecated macro (DISALLOW_EVIL_CONSTRUCTORS).
Use DISALLOW_COPY_AND_ASSIGN instead, also fix some style issues
pointed by lint.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/449075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
| -rw-r--r-- | views/view_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index a326c12..605d4838 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -121,7 +121,7 @@ class EmptyWindow : public CWindowImpl<EmptyWindow, private: bool empty_paint_; - DISALLOW_EVIL_CONSTRUCTORS(EmptyWindow); + DISALLOW_COPY_AND_ASSIGN(EmptyWindow); }; */ @@ -222,7 +222,7 @@ void TestView::ViewHierarchyChanged(bool is_add, View *parent, View *child) { child_ = child; } -} +} // namespace TEST_F(ViewTest, AddRemoveNotifications) { TestView* v1 = new TestView(); @@ -316,7 +316,7 @@ TEST_F(ViewTest, MouseEvent) { v1->SetBounds(0, 0, 300, 300); TestView* v2 = new TestView(); - v2->SetBounds (100, 100, 100, 100); + v2->SetBounds(100, 100, 100, 100); scoped_ptr<Widget> window(CreateWidget()); #if defined(OS_WIN) @@ -936,7 +936,7 @@ class TestViewWithControls : public View { class SimpleWindowDelegate : public WindowDelegate { public: - SimpleWindowDelegate(View* contents) : contents_(contents) { } + explicit SimpleWindowDelegate(View* contents) : contents_(contents) { } virtual void DeleteDelegate() { delete this; } |