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

Unified Diff: chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.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/arc/optin/arc_terms_of_service_oobe_negotiator.h
diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h
index df6f470d5f916353bd38b01316d60ebb61aaa750..23a7a48d731d1d9ea1f5d331a794b3d49c657c6b 100644
--- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h
+++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h
@@ -7,10 +7,10 @@
#include "base/macros.h"
#include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
namespace chromeos {
-class ArcTermsOfServiceScreenActor;
+class ArcTermsOfServiceScreenView;
}
namespace arc {
@@ -18,7 +18,7 @@ namespace arc {
// Handles the Terms-of-service agreement user action via OOBE OptIn UI.
class ArcTermsOfServiceOobeNegotiator
: public ArcTermsOfServiceNegotiator,
- public chromeos::ArcTermsOfServiceScreenActorObserver {
+ public chromeos::ArcTermsOfServiceScreenViewObserver {
public:
ArcTermsOfServiceOobeNegotiator();
~ArcTermsOfServiceOobeNegotiator() override;
@@ -26,7 +26,7 @@ class ArcTermsOfServiceOobeNegotiator
// Injects ARC OOBE screen handler in unit tests, where OOBE UI is not
// available.
static void SetArcTermsOfServiceScreenActorForTesting(
hidehiko 2017/02/23 05:34:08 s/Actor/View/, too?
jdufault 2017/02/24 00:40:15 Done.
- chromeos::ArcTermsOfServiceScreenActor* actor);
+ chromeos::ArcTermsOfServiceScreenView* actor);
hidehiko 2017/02/23 05:34:07 s/actor/view/ too?
jdufault 2017/02/24 00:40:15 Done.
private:
// Helper to handle callbacks from
@@ -39,7 +39,7 @@ class ArcTermsOfServiceOobeNegotiator
// chromeos::ArcTermsOfServiceScreenActorObserver:
hidehiko 2017/02/23 05:34:08 s/Actor/View/ too?
jdufault 2017/02/24 00:40:16 Done.
void OnSkip() override;
void OnAccept() override;
- void OnActorDestroyed(chromeos::ArcTermsOfServiceScreenActor* actor) override;
+ void OnViewDestroyed(chromeos::ArcTermsOfServiceScreenView* view) override;
// ArcTermsOfServiceNegotiator:
void StartNegotiationImpl() override;
@@ -50,7 +50,7 @@ class ArcTermsOfServiceOobeNegotiator
// LoginDisplayHost, but in OnActorDestroyed(), the argument needs to be used.
// In order to use the same way to access the Actor, remember the pointer in
// StartNegotiationImpl(), and reset in HandleTermsAccepted().
- chromeos::ArcTermsOfServiceScreenActor* screen_actor_ = nullptr;
+ chromeos::ArcTermsOfServiceScreenView* screen_view_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceOobeNegotiator);
};

Powered by Google App Engine
This is Rietveld 408576698