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

Unified Diff: chrome/browser/chromeos/login/app_launch_controller.h

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/app_launch_controller.h
diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h
index c0399a7a51d88d16ebd0d772952aed724ea2f93a..abe2c2fc1d2dd90d42763055d3715bc579cab69e 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.h
+++ b/chrome/browser/chromeos/login/app_launch_controller.h
@@ -16,7 +16,7 @@
#include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
#include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
#include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
-#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -30,12 +30,11 @@ class OobeUI;
// Controller for the kiosk app launch process, responsible for
// coordinating loading the kiosk profile, launching the app, and
// updating the splash screen UI.
-class AppLaunchController
- : public AppLaunchSplashScreenActor::Delegate,
- public KioskProfileLoader::Delegate,
- public StartupAppLauncher::Delegate,
- public AppLaunchSigninScreen::Delegate,
- public content::NotificationObserver {
+class AppLaunchController : public AppLaunchSplashScreenView::Delegate,
+ public KioskProfileLoader::Delegate,
+ public StartupAppLauncher::Delegate,
+ public AppLaunchSigninScreen::Delegate,
+ public content::NotificationObserver {
public:
typedef base::Callback<bool()> ReturnBoolCallback;
@@ -123,7 +122,7 @@ class AppLaunchController
const bool diagnostic_mode_;
LoginDisplayHost* host_ = nullptr;
OobeUI* oobe_ui_ = nullptr;
- AppLaunchSplashScreenActor* app_launch_splash_screen_actor_ = nullptr;
+ AppLaunchSplashScreenView* app_launch_splash_screen_actor_ = nullptr;
std::unique_ptr<KioskProfileLoader> kiosk_profile_loader_;
std::unique_ptr<StartupAppLauncher> startup_app_launcher_;
std::unique_ptr<AppLaunchSigninScreen> signin_screen_;

Powered by Google App Engine
This is Rietveld 408576698