| Index: ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| diff --git a/ash/system/chromeos/brightness/tray_brightness_unittest.cc b/ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| index 92fd498aa6745b4df41d5cc1bf2849076ff8c6bd..5f1810e23958a347156d6147924b128fc8fea870 100644
|
| --- a/ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| +++ b/ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| @@ -48,23 +48,27 @@ TEST_F(TrayBrightnessTest, CreateDefaultView) {
|
| // Tests the construction of the default view while MaximizeMode is active.
|
| // The BrightnessView should be visible.
|
| TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(true);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(true);
|
| std::unique_ptr<views::View> tray(CreateDefaultView());
|
| EXPECT_TRUE(tray->visible());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(false);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(false);
|
| }
|
|
|
| // Tests that the enabling of MaximizeMode affects a previously created
|
| // BrightnessView, changing the visibility.
|
| TEST_F(TrayBrightnessTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
|
| std::unique_ptr<views::View> tray(CreateDefaultView());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(true);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(true);
|
| EXPECT_TRUE(tray->visible());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(false);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(false);
|
| EXPECT_FALSE(tray->visible());
|
| }
|
|
|
| @@ -75,29 +79,31 @@ TEST_F(TrayBrightnessTest, CreateDetailedView) {
|
| EXPECT_TRUE(tray->visible());
|
| }
|
|
|
| -
|
| // Tests that when the detailed view is created during MaximizeMode that its
|
| // BrightnessView is visible.
|
| TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(true);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(true);
|
| std::unique_ptr<views::View> tray(CreateDetailedView());
|
| EXPECT_TRUE(tray->visible());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(false);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(false);
|
| }
|
|
|
| // Tests that the enabling of MaximizeMode has no affect on the visibility of a
|
| // previously created BrightnessView that belongs to a detailed view.
|
| TEST_F(TrayBrightnessTest, DetailedViewVisibilityChangesDuringMaximizeMode) {
|
| std::unique_ptr<views::View> tray(CreateDetailedView());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(true);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(true);
|
| EXPECT_TRUE(tray->visible());
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - EnableMaximizeModeWindowManager(false);
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->EnableMaximizeModeWindowManager(false);
|
| EXPECT_TRUE(tray->visible());
|
| }
|
|
|
| } // namespace ash
|
| -
|
|
|