diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-31 02:36:23 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-31 02:36:23 +0000 |
commit | e80daf62322d8494212abacd6c810eddef59b2be (patch) | |
tree | 6d338dab3602fe38d94a98d690948e9ce2e92ecc /views/controls/button | |
parent | 6e9b3df82a13faebedf10cfca50392f8d909d71b (diff) | |
download | chromium_src-e80daf62322d8494212abacd6c810eddef59b2be.zip chromium_src-e80daf62322d8494212abacd6c810eddef59b2be.tar.gz chromium_src-e80daf62322d8494212abacd6c810eddef59b2be.tar.bz2 |
Split out the views table functions into separate header files. Many users only
need either the view or model observers and that's it.
I moved the model constructors to a .cc file so we don't have to include
l10n_util.h for everybody. A surprising number of files were getting l10n_util
from the table code, so I had to add it in a bunch of places.
There should be no code change except I made the table column cosntructors take
wstring references instead of copies.
Review URL: http://codereview.chromium.org/115969
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
-rw-r--r-- | views/controls/button/native_button.h | 2 | ||||
-rw-r--r-- | views/controls/button/native_button_wrapper.h | 3 | ||||
-rw-r--r-- | views/controls/button/text_button.h | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/views/controls/button/native_button.h b/views/controls/button/native_button.h index 50aaff73..3b77d5f 100644 --- a/views/controls/button/native_button.h +++ b/views/controls/button/native_button.h @@ -99,4 +99,4 @@ class NativeButton : public Button { } // namespace views -#endif // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_ +#endif // VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_H_ diff --git a/views/controls/button/native_button_wrapper.h b/views/controls/button/native_button_wrapper.h index 4ae939c..07739af 100644 --- a/views/controls/button/native_button_wrapper.h +++ b/views/controls/button/native_button_wrapper.h @@ -53,9 +53,8 @@ class NativeButtonWrapper { static NativeButtonWrapper* CreateCheckboxWrapper(Checkbox* checkbox); static NativeButtonWrapper* CreateRadioButtonWrapper( RadioButton* radio_button); - }; } // namespace views -#endif // #ifndef VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_ +#endif // VIEWS_CONTROLS_BUTTON_NATIVE_BUTTON_WRAPPER_H_ diff --git a/views/controls/button/text_button.h b/views/controls/button/text_button.h index 8b3d343..1a8134e 100644 --- a/views/controls/button/text_button.h +++ b/views/controls/button/text_button.h @@ -32,8 +32,6 @@ class TextButtonBorder : public Border { virtual void GetInsets(gfx::Insets* insets) const; private: - DISALLOW_EVIL_CONSTRUCTORS(TextButtonBorder); - // Images struct MBBImageSet { SkBitmap* top_left; @@ -48,6 +46,8 @@ class TextButtonBorder : public Border { }; MBBImageSet hot_set_; MBBImageSet pushed_set_; + + DISALLOW_COPY_AND_ASSIGN(TextButtonBorder); }; @@ -130,7 +130,7 @@ class TextButton : public CustomButton { // indicates the width is not constrained. int max_width_; - DISALLOW_EVIL_CONSTRUCTORS(TextButton); + DISALLOW_COPY_AND_ASSIGN(TextButton); }; } // namespace views |