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

Side by Side Diff: ash/system/chromeos/brightness/tray_brightness_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 unified diff | Download patch
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/chromeos/brightness/tray_brightness.h" 5 #include "ash/system/chromeos/brightness/tray_brightness.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ash/test/status_area_widget_test_helper.h" 11 #include "ash/test/status_area_widget_test_helper.h"
12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 12 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 14
15 namespace ash { 15 namespace ash {
16 16
17 class TrayBrightnessTest : public test::AshTestBase { 17 class TrayBrightnessTest : public test::AshTestBase {
18 public: 18 public:
19 TrayBrightnessTest() {} 19 TrayBrightnessTest() {}
20 virtual ~TrayBrightnessTest() {} 20 ~TrayBrightnessTest() override {}
21 21
22 protected: 22 protected:
23 views::View* CreateDefaultView() { 23 views::View* CreateDefaultView() {
24 TrayBrightness tray(NULL); 24 TrayBrightness tray(NULL);
25 return tray.CreateDefaultView( 25 return tray.CreateDefaultView(
26 StatusAreaWidgetTestHelper::GetUserLoginStatus()); 26 StatusAreaWidgetTestHelper::GetUserLoginStatus());
27 } 27 }
28 28
29 views::View* CreateDetailedView() { 29 views::View* CreateDetailedView() {
30 TrayBrightness tray(NULL); 30 TrayBrightness tray(NULL);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 Shell::GetInstance()->maximize_mode_controller()-> 92 Shell::GetInstance()->maximize_mode_controller()->
93 EnableMaximizeModeWindowManager(true); 93 EnableMaximizeModeWindowManager(true);
94 EXPECT_TRUE(tray->visible()); 94 EXPECT_TRUE(tray->visible());
95 Shell::GetInstance()->maximize_mode_controller()-> 95 Shell::GetInstance()->maximize_mode_controller()->
96 EnableMaximizeModeWindowManager(false); 96 EnableMaximizeModeWindowManager(false);
97 EXPECT_TRUE(tray->visible()); 97 EXPECT_TRUE(tray->visible());
98 } 98 }
99 99
100 } // namespace ash 100 } // namespace ash
101 101
OLDNEW
« no previous file with comments | « ash/system/chromeos/brightness/tray_brightness.cc ('k') | ash/system/chromeos/enterprise/tray_enterprise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698