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

Unified Diff: ash/system/chromeos/network/tray_network.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
Index: ash/system/chromeos/network/tray_network.cc
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 1c0363d559f493008aed8c1268e5b7cc26cfbe23..a5c5570f499ef339b74e61f577f811a15e606f6d 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -62,7 +62,7 @@ class NetworkTrayView : public TrayItemView,
ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
}
- virtual const char* GetClassName() const OVERRIDE {
+ virtual const char* GetClassName() const override {
return "NetworkTrayView";
}
@@ -101,13 +101,13 @@ class NetworkTrayView : public TrayItemView,
}
// views::View override.
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
+ virtual void GetAccessibleState(ui::AXViewState* state) override {
state->name = connection_status_string_;
state->role = ui::AX_ROLE_BUTTON;
}
// ui::network_icon::AnimationObserver
- virtual void NetworkIconChanged() OVERRIDE {
+ virtual void NetworkIconChanged() override {
UpdateNetworkStateHandlerIcon();
}
@@ -170,7 +170,7 @@ class NetworkDefaultView : public TrayItemMore,
}
// ui::network_icon::AnimationObserver
- virtual void NetworkIconChanged() OVERRIDE {
+ virtual void NetworkIconChanged() override {
Update();
}
@@ -204,27 +204,27 @@ class NetworkWifiDetailedView : public NetworkDetailedView {
// Overridden from NetworkDetailedView:
- virtual void Init() OVERRIDE {
+ virtual void Init() override {
}
- virtual NetworkDetailedView::DetailedViewType GetViewType() const OVERRIDE {
+ virtual NetworkDetailedView::DetailedViewType GetViewType() const override {
return NetworkDetailedView::WIFI_VIEW;
}
- virtual void ManagerChanged() OVERRIDE {
+ virtual void ManagerChanged() override {
Update();
}
- virtual void NetworkListChanged() OVERRIDE {
+ virtual void NetworkListChanged() override {
Update();
}
virtual void NetworkServiceChanged(
- const chromeos::NetworkState* network) OVERRIDE {
+ const chromeos::NetworkState* network) override {
}
private:
- virtual void Layout() OVERRIDE {
+ virtual void Layout() override {
// Center both views vertically.
views::View::Layout();
image_view_->SetY(
« no previous file with comments | « ash/system/chromeos/network/tray_network.h ('k') | ash/system/chromeos/network/tray_network_state_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698