diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 23:25:13 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 23:25:13 +0000 |
| commit | 48c8fa63122510b2c51c6608a93b30e94192e679 (patch) | |
| tree | dc22b80b2f4103d865cbfe47c6f4dc52c8595985 /chrome/browser/views/bookmark_bar_view_test.cc | |
| parent | 9ea0ea99d3a1140a17712a286414d387eddbe8ac (diff) | |
| download | chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.zip chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.tar.gz chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.tar.bz2 | |
Rework the Button API to be saner in preparation for NativeControl rejiggering.BaseButton->Button, CustomButtonButton->ImageButtonToggleButton->ToggleImageButtonRemoving SetListener (buttons take listener through ctor)Tidy up source files. No functionality changes, just naming and organization.Look at the button classes first, then everything else.
Review URL: http://codereview.chromium.org/46096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view_test.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index 2a4740f..8c5294a 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -190,7 +190,7 @@ class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase { // Button should be depressed. views::TextButton* button = bb_view_->GetBookmarkButton(0); - ASSERT_TRUE(button->GetState() == views::BaseButton::BS_PUSHED); + ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED); // Click on the 2nd menu item (A URL). ASSERT_TRUE(menu->GetSubmenu()); @@ -210,7 +210,7 @@ class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase { // Make sure button is no longer pushed. views::TextButton* button = bb_view_->GetBookmarkButton(0); - ASSERT_TRUE(button->GetState() == views::BaseButton::BS_NORMAL); + ASSERT_TRUE(button->state() == views::CustomButton::BS_NORMAL); views::MenuItemView* menu = bb_view_->GetMenu(); ASSERT_TRUE(menu == NULL || !menu->GetSubmenu()->IsShowing()); @@ -258,7 +258,7 @@ class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase { // Make sure button is no longer pushed. views::TextButton* button = bb_view_->GetBookmarkButton(0); - ASSERT_TRUE(button->GetState() == views::BaseButton::BS_NORMAL); + ASSERT_TRUE(button->state() == views::CustomButton::BS_NORMAL); window_->Activate(); |