OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "ash/shelf/wm_shelf.h" | 7 #include "ash/shelf/shelf.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/system/tray/system_tray.h" | 9 #include "ash/system/tray/system_tray.h" |
10 #include "ash/wm_window.h" | 10 #include "ash/wm_window.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
17 #include "chrome/browser/chrome_notification_types.h" | 17 #include "chrome/browser/chrome_notification_types.h" |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 ScopedStubInstallAttributes install_attributes_; | 322 ScopedStubInstallAttributes install_attributes_; |
323 | 323 |
324 DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryLoginTest); | 324 DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryLoginTest); |
325 }; | 325 }; |
326 | 326 |
327 // Used to make sure that the system tray is visible and within the screen | 327 // Used to make sure that the system tray is visible and within the screen |
328 // bounds after login. | 328 // bounds after login. |
329 void TestSystemTrayIsVisible(bool otr) { | 329 void TestSystemTrayIsVisible(bool otr) { |
330 ash::SystemTray* tray = ash::Shell::Get()->GetPrimarySystemTray(); | 330 ash::SystemTray* tray = ash::Shell::Get()->GetPrimarySystemTray(); |
331 aura::Window* primary_win = ash::Shell::GetPrimaryRootWindow(); | 331 aura::Window* primary_win = ash::Shell::GetPrimaryRootWindow(); |
332 ash::WmShelf* wm_shelf = ash::WmShelf::ForWindow(primary_win); | 332 ash::Shelf* shelf = ash::Shelf::ForWindow(primary_win); |
333 SCOPED_TRACE(testing::Message() | 333 SCOPED_TRACE(testing::Message() |
334 << "ShelfVisibilityState=" << wm_shelf->GetVisibilityState() | 334 << "ShelfVisibilityState=" << shelf->GetVisibilityState() |
335 << " ShelfAutoHideBehavior=" << wm_shelf->auto_hide_behavior()); | 335 << " ShelfAutoHideBehavior=" << shelf->auto_hide_behavior()); |
336 EXPECT_TRUE(tray->visible()); | 336 EXPECT_TRUE(tray->visible()); |
337 | 337 |
338 // This check flakes for LoginGuestTest: https://crbug.com/693106. | 338 // This check flakes for LoginGuestTest: https://crbug.com/693106. |
339 if (!otr) | 339 if (!otr) |
340 EXPECT_TRUE(RectContains(primary_win->bounds(), tray->GetBoundsInScreen())); | 340 EXPECT_TRUE(RectContains(primary_win->bounds(), tray->GetBoundsInScreen())); |
341 } | 341 } |
342 | 342 |
343 } // namespace | 343 } // namespace |
344 | 344 |
345 // After a chrome crash, the session manager will restart chrome with | 345 // After a chrome crash, the session manager will restart chrome with |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
478 TestDomainVisible(); | 478 TestDomainVisible(); |
479 | 479 |
480 fake_auth_policy_client_->set_auth_error(authpolicy::ERROR_BAD_PASSWORD); | 480 fake_auth_policy_client_->set_auth_error(authpolicy::ERROR_BAD_PASSWORD); |
481 SubmitActiveDirectoryCredentials(kTestActiveDirectoryUser, kPassword); | 481 SubmitActiveDirectoryCredentials(kTestActiveDirectoryUser, kPassword); |
482 WaitForMessage(&message_queue, "\"ShowAuthError\""); | 482 WaitForMessage(&message_queue, "\"ShowAuthError\""); |
483 TestPasswordError(); | 483 TestPasswordError(); |
484 TestDomainVisible(); | 484 TestDomainVisible(); |
485 } | 485 } |
486 | 486 |
487 } // namespace chromeos | 487 } // namespace chromeos |
OLD | NEW |