summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorglevin <glevin@chromium.org>2015-08-21 15:55:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-21 22:56:17 +0000
commit9b940e7c2a30a319607d5e62c91fe361b3955859 (patch)
treec35cfb268694a22ac6b17a6879a0edaa42edeb59 /ash
parenta68d5e803edec028fa15c178cb14c281ada851e3 (diff)
downloadchromium_src-9b940e7c2a30a319607d5e62c91fe361b3955859.zip
chromium_src-9b940e7c2a30a319607d5e62c91fe361b3955859.tar.gz
chromium_src-9b940e7c2a30a319607d5e62c91fe361b3955859.tar.bz2
Fix hover highlight on Tray menu buttons
BUG=517785 TEST=Mouse hover over SystemTray menu's Sign Out button, or horizontal text buttons in submenus (e.g. Join other|Mobile|Settings in Network submenu). The hover-over style should be a light grey square with a slightly darker border. See Expected_focus.png in issue description. Review URL: https://codereview.chromium.org/1308853006 Cr-Commit-Position: refs/heads/master@{#344894}
Diffstat (limited to 'ash')
-rw-r--r--ash/system/tray/tray_popup_label_button_border.cc4
-rw-r--r--ash/system/tray/tray_popup_label_button_border.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/system/tray/tray_popup_label_button_border.cc b/ash/system/tray/tray_popup_label_button_border.cc
index 693fce1..90c9401 100644
--- a/ash/system/tray/tray_popup_label_button_border.cc
+++ b/ash/system/tray/tray_popup_label_button_border.cc
@@ -89,10 +89,10 @@ void TrayPopupLabelButtonBorder::Paint(const views::View& view,
canvas->Save();
canvas->Translate(gfx::Vector2d(view.width(), 0));
canvas->Scale(-1, 1);
- LabelButtonBorder::Paint(view, canvas);
+ LabelButtonAssetBorder::Paint(view, canvas);
canvas->Restore();
} else {
- LabelButtonBorder::Paint(view, canvas);
+ LabelButtonAssetBorder::Paint(view, canvas);
}
}
diff --git a/ash/system/tray/tray_popup_label_button_border.h b/ash/system/tray/tray_popup_label_button_border.h
index 1afca11..c61a2be 100644
--- a/ash/system/tray/tray_popup_label_button_border.h
+++ b/ash/system/tray/tray_popup_label_button_border.h
@@ -18,7 +18,7 @@ class TrayPopupLabelButtonBorder : public views::LabelButtonAssetBorder {
TrayPopupLabelButtonBorder();
~TrayPopupLabelButtonBorder() override;
- // views::LabelButtonBorder:
+ // views::LabelButtonAssetBorder:
void Paint(const views::View& view, gfx::Canvas* canvas) override;
private: