diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 16:48:23 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 16:48:23 +0000 |
| commit | a7488a134b0b011c8724ccca6d6f16a549a561e0 (patch) | |
| tree | 02248ca3a406edee5ff7d346b30cd20125003456 /views/view_unittest.cc | |
| parent | 512ac40edc7551c76bbd9bf288afee209f6bba15 (diff) | |
| download | chromium_src-a7488a134b0b011c8724ccca6d6f16a549a561e0.zip chromium_src-a7488a134b0b011c8724ccca6d6f16a549a561e0.tar.gz chromium_src-a7488a134b0b011c8724ccca6d6f16a549a561e0.tar.bz2 | |
Updated remaining button to text button. Reverted the interposed
class NativeButtonBase which is no longer needed.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7218035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
| -rw-r--r-- | views/view_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 765e2c9..030e6cd 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -931,10 +931,10 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) { //////////////////////////////////////////////////////////////////////////////// // Mouse-wheel message rerouting //////////////////////////////////////////////////////////////////////////////// -class ButtonTest : public NativeButtonBase { +class ButtonTest : public NativeButton { public: ButtonTest(ButtonListener* listener, const std::wstring& label) - : NativeButtonBase(listener, label) { + : NativeButton(listener, label) { } HWND GetHWND() { @@ -1112,8 +1112,8 @@ class TestDialog : public DialogDelegate, public ButtonListener { virtual View* GetContentsView() OVERRIDE { if (!contents_) { contents_ = new View(); - button1_ = new NativeButtonBase(this, L"Button1"); - button2_ = new NativeButtonBase(this, L"Button2"); + button1_ = new NativeTextButton(this, L"Button1"); + button2_ = new NativeTextButton(this, L"Button2"); checkbox_ = new NativeCheckbox(L"My checkbox"); button_drop_ = new ButtonDropDown(this, mock_menu_model_); contents_->AddChildView(button1_); @@ -1165,9 +1165,9 @@ class TestDialog : public DialogDelegate, public ButtonListener { } View* contents_; - NativeButtonBase* button1_; - NativeButtonBase* button2_; - NativeButtonBase* checkbox_; + NativeTextButton* button1_; + NativeTextButton* button2_; + NativeCheckbox* checkbox_; ButtonDropDown* button_drop_; Button* last_pressed_button_; MockMenuModel* mock_menu_model_; @@ -1241,8 +1241,8 @@ class DefaultButtonTest : public ViewTest { FocusManager* focus_manager_; TestDialog* test_dialog_; DialogClientView* client_view_; - NativeButton* ok_button_; - NativeButton* cancel_button_; + NativeTextButton* ok_button_; + NativeTextButton* cancel_button_; }; TEST_F(DefaultButtonTest, DialogDefaultButtonTest) { @@ -1344,7 +1344,7 @@ TEST_F(ViewTest, ChangeVisibility) { scoped_ptr<Widget> window(CreateWidget()); window->Init(NULL, gfx::Rect(0, 0, 500, 300)); View* root_view = window->GetRootView(); - NativeButtonBase* native = new NativeButtonBase(NULL, L"Native"); + NativeTextButton* native = new NativeTextButton(NULL, L"Native"); root_view->SetContentsView(native); native->SetVisible(true); |