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

Unified Diff: ash/wm/toplevel_window_event_handler_unittest.cc

Issue 24980006: ash: Remove old lock animation implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again Created 7 years, 3 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
« no previous file with comments | « ash/wm/session_state_controller_impl.cc ('k') | build/ios/grit_whitelist.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/toplevel_window_event_handler_unittest.cc
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc
index 5f37213f64511195aa8c3b21402ec6b66bcd6e62..45958e84364407ba0b3ac2cdf144de1649187476 100644
--- a/ash/wm/toplevel_window_event_handler_unittest.cc
+++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -9,7 +9,7 @@
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/lock_state_controller_impl2.h"
+#include "ash/wm/lock_state_controller.h"
#include "ash/wm/resize_shadow.h"
#include "ash/wm/resize_shadow_controller.h"
#include "ash/wm/window_state.h"
@@ -464,9 +464,8 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
// Tests that a gesture cannot minimize a window in login/lock screen.
TEST_F(ToplevelWindowEventHandlerTest, GestureDragMinimizeLoginScreen) {
- LockStateControllerImpl2* state_controller =
- static_cast<LockStateControllerImpl2*>
- (Shell::GetInstance()->lock_state_controller());
+ LockStateController* state_controller =
+ Shell::GetInstance()->lock_state_controller();
state_controller->OnLoginStateChanged(user::LOGGED_IN_NONE);
state_controller->OnLockStateChanged(false);
SetUserLoggedIn(false);
« no previous file with comments | « ash/wm/session_state_controller_impl.cc ('k') | build/ios/grit_whitelist.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698