diff options
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 5 | ||||
| -rw-r--r-- | ash/system/chromeos/network/tray_network.cc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 5854f8d..aebede4 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -46,8 +46,9 @@ class PanedWidgetDelegate : public views::WidgetDelegate { } // views::WidgetDelegate. - virtual void GetAccessiblePanes(std::vector<views::View*>* panes) { - std::copy(accessible_panes_.begin(), accessible_panes_.end(), + virtual void GetAccessiblePanes(std::vector<views::View*>* panes) OVERRIDE { + std::copy(accessible_panes_.begin(), + accessible_panes_.end(), std::back_inserter(*panes)); } virtual views::Widget* GetWidget() OVERRIDE { diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index eabb74d..911b272 100644 --- a/ash/system/chromeos/network/tray_network.cc +++ b/ash/system/chromeos/network/tray_network.cc @@ -131,7 +131,9 @@ class NetworkTrayView : public TrayItemView, network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); } - std::string GetClassName() const { return "NetworkTrayView"; } + virtual std::string GetClassName() const OVERRIDE { + return "NetworkTrayView"; + } void Update(const NetworkIconInfo& info) { if (UseNewNetworkHandlers()) |