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

Side by Side Diff: ash/system/overview/overview_button_tray_unittest.cc

Issue 683473005: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/status_area_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/overview/overview_button_tray.h" 5 #include "ash/system/overview/overview_button_tray.h"
6 6
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_types.h" 9 #include "ash/shelf/shelf_types.h"
10 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
(...skipping 22 matching lines...) Expand all
33 OverviewButtonTray* GetSecondaryTray() { 33 OverviewButtonTray* GetSecondaryTray() {
34 return StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget()-> 34 return StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget()->
35 overview_button_tray(); 35 overview_button_tray();
36 } 36 }
37 37
38 } // namespace 38 } // namespace
39 39
40 class OverviewButtonTrayTest : public test::AshTestBase { 40 class OverviewButtonTrayTest : public test::AshTestBase {
41 public: 41 public:
42 OverviewButtonTrayTest() {} 42 OverviewButtonTrayTest() {}
43 virtual ~OverviewButtonTrayTest() {} 43 ~OverviewButtonTrayTest() override {}
44 44
45 protected: 45 protected:
46 views::ImageView* GetImageView(OverviewButtonTray* tray) { 46 views::ImageView* GetImageView(OverviewButtonTray* tray) {
47 return tray->icon_; 47 return tray->icon_;
48 } 48 }
49 49
50 private: 50 private:
51 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTrayTest); 51 DISALLOW_COPY_AND_ASSIGN(OverviewButtonTrayTest);
52 }; 52 };
53 53
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 Shell::GetInstance()->window_selector_controller()->IsSelecting()); 150 Shell::GetInstance()->window_selector_controller()->IsSelecting());
151 EXPECT_TRUE(GetTray()->draw_background_as_active()); 151 EXPECT_TRUE(GetTray()->draw_background_as_active());
152 152
153 Shell::GetInstance()->window_selector_controller()->OnSelectionEnded(); 153 Shell::GetInstance()->window_selector_controller()->OnSelectionEnded();
154 EXPECT_FALSE( 154 EXPECT_FALSE(
155 Shell::GetInstance()->window_selector_controller()->IsSelecting()); 155 Shell::GetInstance()->window_selector_controller()->IsSelecting());
156 EXPECT_FALSE(GetTray()->draw_background_as_active()); 156 EXPECT_FALSE(GetTray()->draw_background_as_active());
157 } 157 }
158 158
159 } // namespace ash 159 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/status_area_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698