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

Side by Side Diff: chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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 "chrome/browser/chromeos/login/lock/screen_locker.h" 5 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/wm/window_state.h" 9 #include "ash/wm/window_state.h"
10 #include "ash/wm/window_state_aura.h"
11 #include "base/command_line.h" 10 #include "base/command_line.h"
12 #include "base/macros.h" 11 #include "base/macros.h"
13 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
14 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" 14 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
16 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 15 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
17 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 19 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 EXPECT_EQ("", tester->GetPassword()); 322 EXPECT_EQ("", tester->GetPassword());
324 323
325 // Close the locker to match expectations. 324 // Close the locker to match expectations.
326 ScreenLocker::Hide(); 325 ScreenLocker::Hide();
327 content::RunAllPendingInMessageLoop(); 326 content::RunAllPendingInMessageLoop();
328 EXPECT_FALSE(tester->IsLocked()); 327 EXPECT_FALSE(tester->IsLocked());
329 EXPECT_TRUE(VerifyLockScreenDismissed()); 328 EXPECT_TRUE(VerifyLockScreenDismissed());
330 } 329 }
331 330
332 } // namespace chromeos 331 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698