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

Unified Diff: ash/focus_cycler_unittest.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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/first_run/first_run_helper_unittest.cc ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/focus_cycler_unittest.cc
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 8855adc6ba976c277cc2ccadaa4b94178cb4b8fe..e8a8ca867ad4b3dd36117fa8f232624a886c83d1 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -43,17 +43,13 @@ class PanedWidgetDelegate : public views::WidgetDelegate {
}
// views::WidgetDelegate.
- virtual void GetAccessiblePanes(std::vector<views::View*>* panes) override {
+ 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 {
- return widget_;
- };
- virtual const views::Widget* GetWidget() const override {
- return widget_;
- }
+ views::Widget* GetWidget() override { return widget_; };
+ const views::Widget* GetWidget() const override { return widget_; }
private:
views::Widget* widget_;
@@ -66,7 +62,7 @@ class FocusCyclerTest : public AshTestBase {
public:
FocusCyclerTest() {}
- virtual void SetUp() override {
+ void SetUp() override {
AshTestBase::SetUp();
focus_cycler_.reset(new FocusCycler());
@@ -74,7 +70,7 @@ class FocusCyclerTest : public AshTestBase {
ASSERT_TRUE(Shelf::ForPrimaryDisplay());
}
- virtual void TearDown() override {
+ void TearDown() override {
if (tray_) {
GetStatusAreaWidgetDelegate(tray_->GetWidget())->
SetFocusCyclerForTesting(NULL);
« no previous file with comments | « ash/first_run/first_run_helper_unittest.cc ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698