Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1502)

Unified Diff: ash/system/chromeos/tray_display.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/tray_display.h ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index a02e0c81e1bb811d86d450ade4bdb7d665926b0e..fc6facf9c2a1797cf1e509d102a9344970d44025 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -170,7 +170,7 @@ class DisplayView : public ActionableView {
// Overridden from views::View.
virtual bool GetTooltipText(const gfx::Point& p,
- base::string16* tooltip) const OVERRIDE {
+ base::string16* tooltip) const override {
base::string16 tray_message = GetTrayDisplayMessage(NULL);
base::string16 display_message = GetAllDisplayInfo();
if (tray_message.empty() && display_message.empty())
@@ -269,12 +269,12 @@ class DisplayView : public ActionableView {
}
// Overridden from ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE {
+ virtual bool PerformAction(const ui::Event& event) override {
OpenSettings();
return true;
}
- virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
+ virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override {
int label_max_width = bounds().width() - kTrayPopupPaddingHorizontal * 2 -
kTrayPopupPaddingBetweenItems - image_->GetPreferredSize().width();
label_->SizeToFit(label_max_width);
« no previous file with comments | « ash/system/chromeos/tray_display.h ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698