summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 01:08:54 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 01:08:54 +0000
commitf607da73bcdfe9c3c2942ead26099c2682d8eb8e (patch)
treeb510a6930150e691ee25ad9e92c0c240050b7d8b
parent5ff816830d5e4af59df86020eb9411edab452d63 (diff)
downloadchromium_src-f607da73bcdfe9c3c2942ead26099c2682d8eb8e.zip
chromium_src-f607da73bcdfe9c3c2942ead26099c2682d8eb8e.tar.gz
chromium_src-f607da73bcdfe9c3c2942ead26099c2682d8eb8e.tar.bz2
views: Remove SetHighlightColor usages.
This seems to be equivalent to SetHoverColor and LabelButton doesn't have/implement this concept. So to make the life easier just remove it. BUG=155363 R=msw@chromium.org Review URL: https://chromiumcodereview.appspot.com/14331002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195038 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/infobars/infobar_view.cc2
-rw-r--r--chrome/browser/ui/views/infobars/one_click_signin_infobar.cc1
-rw-r--r--ui/message_center/views/message_center_view.cc1
3 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index 9e11dff8..1be9e5f 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -107,7 +107,6 @@ views::MenuButton* InfoBarView::CreateMenuButton(
menu_button->set_menu_marker(
rb.GetImageNamed(IDR_INFOBARBUTTON_MENU_DROPARROW).ToImageSkia());
menu_button->SetEnabledColor(SK_ColorBLACK);
- menu_button->SetHighlightColor(SK_ColorBLACK);
menu_button->SetHoverColor(SK_ColorBLACK);
menu_button->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
menu_button->set_focusable(true);
@@ -123,7 +122,6 @@ views::TextButton* InfoBarView::CreateTextButton(
text_button->set_border(new InfoBarButtonBorder);
text_button->set_animate_on_state_change(false);
text_button->SetEnabledColor(SK_ColorBLACK);
- text_button->SetHighlightColor(SK_ColorBLACK);
text_button->SetHoverColor(SK_ColorBLACK);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
text_button->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
diff --git a/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc b/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc
index 1752e26..e31d6ff 100644
--- a/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc
+++ b/chrome/browser/ui/views/infobars/one_click_signin_infobar.cc
@@ -140,6 +140,5 @@ void OneClickSigninInfoBar::ViewHierarchyChanged(bool is_add,
alt_colors.button_background_color,
alt_colors.button_border_color));
ok_button()->SetEnabledColor(alt_colors.button_text_color);
- ok_button()->SetHighlightColor(alt_colors.button_text_color);
ok_button()->SetHoverColor(alt_colors.button_text_color);
}
diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc
index b7a6390..ab36c83 100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -126,7 +126,6 @@ NotificationCenterButton::NotificationCenterButton(
set_border(views::Border::CreateEmptyBorder(0, 16, 0, 16));
set_min_height(kFooterHeight);
SetEnabledColor(kFooterTextColor);
- SetHighlightColor(kButtonTextHighlightColor);
SetHoverColor(kButtonTextHoverColor);
}