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

Unified Diff: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
index d8bcff6b030191d0efdd4c3b4d2cabdc06d4284a..134245c7b3e1931bfcf3bc27d1e5769a6295fdf9 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/chromeos/login/help_app_launcher.h"
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
#include "chrome/browser/chromeos/login/screens/eula_screen.h"
#include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
#include "chrome/browser/chromeos/login/ui/webui_login_display.h"
@@ -82,8 +82,8 @@ void ShowCreditsDialog(Profile* profile,
namespace chromeos {
-EulaScreenHandler::EulaScreenHandler(CoreOobeActor* core_oobe_actor)
- : core_oobe_actor_(core_oobe_actor) {
+EulaScreenHandler::EulaScreenHandler(CoreOobeView* core_oobe_view)
+ : core_oobe_view_(core_oobe_view) {
set_call_js_prefix(kJsScreenPath);
}
@@ -173,12 +173,12 @@ void EulaScreenHandler::Initialize() {
if (!page_is_ready() || !screen_)
return;
- core_oobe_actor_->SetUsageStats(screen_->IsUsageStatsEnabled());
+ core_oobe_view_->SetUsageStats(screen_->IsUsageStatsEnabled());
// This OEM EULA is a file:// URL which we're unable to load in iframe.
// Instead if it's defined we use chrome://terms/oem that will load same file.
if (!screen_->GetOemEulaUrl().is_empty())
- core_oobe_actor_->SetOemEulaUrl(chrome::kChromeUITermsOemURL);
+ core_oobe_view_->SetOemEulaUrl(chrome::kChromeUITermsOemURL);
if (show_on_init_) {
Show();
@@ -187,7 +187,7 @@ void EulaScreenHandler::Initialize() {
}
void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
- core_oobe_actor_->SetTpmPassword(tpm_password);
+ core_oobe_view_->SetTpmPassword(tpm_password);
}
void EulaScreenHandler::HandleOnLearnMore() {

Powered by Google App Engine
This is Rietveld 408576698