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

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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"
10 #include "base/command_line.h" 11 #include "base/command_line.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h" 15 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
15 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 16 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
16 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 20 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 EXPECT_EQ("", tester->GetPassword()); 314 EXPECT_EQ("", tester->GetPassword());
314 315
315 // Close the locker to match expectations. 316 // Close the locker to match expectations.
316 ScreenLocker::Hide(); 317 ScreenLocker::Hide();
317 content::RunAllPendingInMessageLoop(); 318 content::RunAllPendingInMessageLoop();
318 EXPECT_FALSE(tester->IsLocked()); 319 EXPECT_FALSE(tester->IsLocked());
319 EXPECT_TRUE(VerifyLockScreenDismissed()); 320 EXPECT_TRUE(VerifyLockScreenDismissed());
320 } 321 }
321 322
322 } // namespace chromeos 323 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/screen_locker.cc ('k') | chrome/browser/notifications/fullscreen_notification_blocker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698