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

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

Issue 326813004: Added quick lock mechanism while in Touchview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted immediate lock on power button press. Created 6 years, 6 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/wm/maximize_mode/maximize_mode_controller_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index 8afb9e380c41f6c55270f94f089324aa12d36737..2a6c37986ee697ec1fe2f1b574a2b5bc74ef81eb 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -10,8 +10,6 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/display_manager_test_api.h"
-#include "ash/test/test_lock_state_controller_delegate.h"
-#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_system_tray_delegate.h"
#include "ash/test/test_volume_control_delegate.h"
#include "ash/wm/maximize_mode/internal_input_device_list.h"
@@ -392,36 +390,6 @@ TEST_F(MaximizeModeControllerTest, BlocksKeyboardAndMouse) {
counter.reset();
}
-#if defined(OS_CHROMEOS)
-// Tests that a screenshot can be taken in maximize mode by holding volume down
-// and pressing power.
-TEST_F(MaximizeModeControllerTest, Screenshot) {
- Shell::GetInstance()->lock_state_controller()->SetDelegate(
- new test::TestLockStateControllerDelegate);
- aura::Window* root = Shell::GetPrimaryRootWindow();
- aura::test::EventGenerator event_generator(root, root);
- test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();
- delegate->set_can_take_screenshot(true);
-
- // Open up 270 degrees.
- TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
- gfx::Vector3dF(1.0f, 0.0f, 0.0f));
- ASSERT_TRUE(IsMaximizeModeStarted());
-
- // Pressing power alone does not take a screenshot.
- event_generator.PressKey(ui::VKEY_POWER, 0);
- event_generator.ReleaseKey(ui::VKEY_POWER, 0);
- EXPECT_EQ(0, delegate->handle_take_screenshot_count());
-
- // Holding volume down and pressing power takes a screenshot.
- event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0);
- event_generator.PressKey(ui::VKEY_POWER, 0);
- event_generator.ReleaseKey(ui::VKEY_POWER, 0);
- EXPECT_EQ(1, delegate->handle_take_screenshot_count());
- event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0);
-}
-#endif // OS_CHROMEOS
-
#if defined(USE_X11)
// Tests that maximize mode allows volume up/down events originating
// from dedicated buttons versus remapped keyboard buttons.

Powered by Google App Engine
This is Rietveld 408576698