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/window | |
| 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/window')
| -rw-r--r-- | views/window/custom_frame_view.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/window/custom_frame_view.h b/views/window/custom_frame_view.h index 0ae0050..9de22f0 100644 --- a/views/window/custom_frame_view.h +++ b/views/window/custom_frame_view.h @@ -10,7 +10,7 @@ #include "views/window/window.h" #include "views/window/window_resources.h" -namespace gfx{ +namespace gfx { class Canvas; class Font; class Size; @@ -106,9 +106,9 @@ class CustomFrameView : public NonClientFrameView, static void InitClass(); static gfx::Font* title_font_; - DISALLOW_EVIL_CONSTRUCTORS(CustomFrameView); + DISALLOW_COPY_AND_ASSIGN(CustomFrameView); }; } // namespace views -#endif // #ifndef VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ +#endif // VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ |