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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 years, 10 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <memory> 5 #include <memory>
6 #include <vector> 6 #include <vector>
7 7
8 #include "apps/test/app_window_waiter.h" 8 #include "apps/test/app_window_waiter.h"
9 #include "ash/common/wallpaper/wallpaper_controller.h" 9 #include "ash/common/wallpaper/wallpaper_controller.h"
10 #include "ash/common/wallpaper/wallpaper_controller_observer.h" 10 #include "ash/common/wallpaper/wallpaper_controller_observer.h"
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 WaitForAppLaunchNetworkTimeout(); 756 WaitForAppLaunchNetworkTimeout();
757 757
758 // Configure network link should be visible. 758 // Configure network link should be visible.
759 JsExpect("$('splash-config-network').hidden == false"); 759 JsExpect("$('splash-config-network').hidden == false");
760 760
761 // Set up fake user manager with an owner for the test. 761 // Set up fake user manager with an owner for the test.
762 LoginDisplayHost::default_host()->GetOobeUI()->ShowOobeUI(false); 762 LoginDisplayHost::default_host()->GetOobeUI()->ShowOobeUI(false);
763 763
764 // Configure network should bring up lock screen for owner. 764 // Configure network should bring up lock screen for owner.
765 OobeScreenWaiter lock_screen_waiter(OobeScreen::SCREEN_ACCOUNT_PICKER); 765 OobeScreenWaiter lock_screen_waiter(OobeScreen::SCREEN_ACCOUNT_PICKER);
766 static_cast<AppLaunchSplashScreenActor::Delegate*>(GetAppLaunchController()) 766 static_cast<AppLaunchSplashScreenView::Delegate*>(GetAppLaunchController())
767 ->OnConfigureNetwork(); 767 ->OnConfigureNetwork();
768 lock_screen_waiter.Wait(); 768 lock_screen_waiter.Wait();
769 769
770 // There should be only one owner pod on this screen. 770 // There should be only one owner pod on this screen.
771 JsExpect("$('pod-row').alwaysFocusSinglePod"); 771 JsExpect("$('pod-row').alwaysFocusSinglePod");
772 772
773 // A network error screen should be shown after authenticating. 773 // A network error screen should be shown after authenticating.
774 OobeScreenWaiter error_screen_waiter(OobeScreen::SCREEN_ERROR_MESSAGE); 774 OobeScreenWaiter error_screen_waiter(OobeScreen::SCREEN_ERROR_MESSAGE);
775 static_cast<AppLaunchSigninScreen::Delegate*>(GetAppLaunchController()) 775 static_cast<AppLaunchSigninScreen::Delegate*>(GetAppLaunchController())
776 ->OnOwnerSigninSuccess(); 776 ->OnOwnerSigninSuccess();
(...skipping 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after
2392 content::WindowedNotificationObserver( 2392 content::WindowedNotificationObserver(
2393 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE, 2393 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
2394 content::NotificationService::AllSources()).Wait(); 2394 content::NotificationService::AllSources()).Wait();
2395 2395
2396 // Wait for the wallpaper to load. 2396 // Wait for the wallpaper to load.
2397 WaitForWallpaper(); 2397 WaitForWallpaper();
2398 EXPECT_TRUE(wallpaper_loaded()); 2398 EXPECT_TRUE(wallpaper_loaded());
2399 } 2399 }
2400 2400
2401 } // namespace chromeos 2401 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698