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

Unified Diff: chrome/browser/chromeos/login/screens/controller_pairing_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/screens/controller_pairing_screen.h
diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
index 9305e144d2cdca518dd39a832ac87f4d38b9f23c..3cd02c70357f4b8570c7863c9d887ade619e7758 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h"
#include "components/login/screens/screen_context.h"
#include "components/pairing/controller_pairing_controller.h"
@@ -17,7 +17,7 @@ namespace chromeos {
class ControllerPairingScreen
: public BaseScreen,
public pairing_chromeos::ControllerPairingController::Observer,
- public ControllerPairingScreenActor::Delegate {
+ public ControllerPairingScreenView::Delegate {
public:
class Delegate {
public:
@@ -33,7 +33,7 @@ class ControllerPairingScreen
ControllerPairingScreen(
BaseScreenDelegate* base_screen_delegate,
Delegate* delegate,
- ControllerPairingScreenActor* actor,
+ ControllerPairingScreenView* view,
pairing_chromeos::ControllerPairingController* shark_controller);
~ControllerPairingScreen() override;
@@ -52,13 +52,13 @@ class ControllerPairingScreen
void DiscoveredDevicesListChanged() override;
// Overridden from ControllerPairingView::Delegate:
- void OnActorDestroyed(ControllerPairingScreenActor* actor) override;
+ void OnViewDestroyed(ControllerPairingScreenView* view) override;
void OnScreenContextChanged(const base::DictionaryValue& diff) override;
void OnUserActed(const std::string& action) override;
Delegate* delegate_;
- ControllerPairingScreenActor* actor_;
+ ControllerPairingScreenView* view_;
// Controller performing pairing. Owned by the wizard controller.
pairing_chromeos::ControllerPairingController* shark_controller_;

Powered by Google App Engine
This is Rietveld 408576698