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

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.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/enrollment/enrollment_screen.h
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
index 6e547f6b7bb84fbcd5b63f5555fe39adf2948875..7cabf4c802f0e81954e317ece1c58f55a9badea3 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
@@ -14,7 +14,7 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
@@ -41,11 +41,11 @@ class ScreenManager;
class EnrollmentScreen
: public BaseScreen,
public EnterpriseEnrollmentHelper::EnrollmentStatusConsumer,
- public EnrollmentScreenActor::Controller,
+ public EnrollmentScreenView::Controller,
public ActiveDirectoryJoinDelegate {
public:
EnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
- EnrollmentScreenActor* actor);
+ EnrollmentScreenView* view);
~EnrollmentScreen() override;
static EnrollmentScreen* Get(ScreenManager* manager);
@@ -61,7 +61,7 @@ class EnrollmentScreen
void Show() override;
void Hide() override;
- // EnrollmentScreenActor::Controller implementation:
+ // EnrollmentScreenView::Controller implementation:
void OnLoginDone(const std::string& user,
const std::string& auth_code) override;
void OnRetry() override;
@@ -83,9 +83,7 @@ class EnrollmentScreen
void JoinDomain(OnDomainJoinedCallback on_joined_callback) override;
// Used for testing.
- EnrollmentScreenActor* GetActor() {
- return actor_;
- }
+ EnrollmentScreenView* GetView() { return view_; }
private:
friend class EnrollmentScreenUnitTest;
@@ -166,7 +164,7 @@ class EnrollmentScreen
pairing_chromeos::ControllerPairingController* shark_controller_ = nullptr;
- EnrollmentScreenActor* actor_;
+ EnrollmentScreenView* view_;
policy::EnrollmentConfig config_;
policy::EnrollmentConfig enrollment_config_;
Auth current_auth_ = AUTH_OAUTH;

Powered by Google App Engine
This is Rietveld 408576698