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

Unified Diff: ash/common/system/chromeos/brightness/tray_brightness_unittest.cc

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 years, 10 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
Index: ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
diff --git a/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc b/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
deleted file mode 100644
index edc7ac0928f0963dcb47b6cad162d0fbd3dd4be1..0000000000000000000000000000000000000000
--- a/ash/common/system/chromeos/brightness/tray_brightness_unittest.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/common/system/chromeos/brightness/tray_brightness.h"
-
-#include <memory>
-
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/common/test/ash_test.h"
-#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/common/wm_shell.h"
-#include "ui/views/view.h"
-
-namespace ash {
-
-class TrayBrightnessTest : public AshTest {
- public:
- TrayBrightnessTest() {}
- ~TrayBrightnessTest() override {}
-
- protected:
- views::View* CreateDefaultView() {
- TrayBrightness tray(NULL);
- // The login status doesn't matter here; supply any random value.
- return tray.CreateDefaultView(LoginStatus::USER);
- }
-
- views::View* CreateDetailedView() {
- TrayBrightness tray(NULL);
- // The login status doesn't matter here; supply any random value.
- return tray.CreateDetailedView(LoginStatus::USER);
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TrayBrightnessTest);
-};
-
-// Tests that when the default view is initially created, that its
-// BrightnessView is created not visible.
-TEST_F(TrayBrightnessTest, CreateDefaultView) {
- std::unique_ptr<views::View> tray(CreateDefaultView());
- EXPECT_FALSE(tray->visible());
-}
-
-// Tests the construction of the default view while MaximizeMode is active.
-// The BrightnessView should be visible.
-TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
- true);
- std::unique_ptr<views::View> tray(CreateDefaultView());
- EXPECT_TRUE(tray->visible());
- WmShell::Get()->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());
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
- true);
- EXPECT_TRUE(tray->visible());
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
- false);
- EXPECT_FALSE(tray->visible());
-}
-
-// Tests that when the detailed view is initially created that its
-// BrightnessView is created as visible for both MD and non MD modes.
-TEST_F(TrayBrightnessTest, CreateDetailedView) {
- std::unique_ptr<views::View> tray(CreateDetailedView());
- EXPECT_TRUE(tray->visible());
-}
-
-// Tests that when the detailed view is created during MaximizeMode that its
-// BrightnessView is visible.
-TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
- true);
- std::unique_ptr<views::View> tray(CreateDetailedView());
- EXPECT_TRUE(tray->visible());
- WmShell::Get()->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());
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
- true);
- EXPECT_TRUE(tray->visible());
- WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
- false);
- EXPECT_TRUE(tray->visible());
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/system/chromeos/brightness/tray_brightness.cc ('k') | ash/common/system/chromeos/cast/tray_cast.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698