| Index: chrome/browser/chromeos/login/wizard_controller.h
|
| diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
|
| index 2d1e5a16b357c06c6bc34d8bf6e0fc79a4d6a547..38380d632a0ea72332310db50257d83aa3830169 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.h
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.h
|
| @@ -13,6 +13,8 @@
|
| #include "chrome/browser/chromeos/login/screen_observer.h"
|
| #include "chrome/browser/chromeos/login/view_screen.h"
|
| #include "chrome/browser/chromeos/login/wizard_screen.h"
|
| +#include "chrome/common/notification_observer.h"
|
| +#include "chrome/common/notification_registrar.h"
|
| #include "gfx/rect.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "testing/gtest/include/gtest/gtest_prod.h"
|
| @@ -48,7 +50,8 @@ class WidgetGtk;
|
| // Class that manages control flow between wizard screens. Wizard controller
|
| // interacts with screen controllers to move the user between screens.
|
| class WizardController : public chromeos::ScreenObserver,
|
| - public WizardScreenDelegate {
|
| + public WizardScreenDelegate,
|
| + public NotificationObserver {
|
| public:
|
| WizardController();
|
| ~WizardController();
|
| @@ -159,6 +162,11 @@ class WizardController : public chromeos::ScreenObserver,
|
| static const char kEulaScreenName[];
|
| static const char kHTMLPageScreenName[];
|
|
|
| + // NotificationObserver implementation:
|
| + virtual void Observe(NotificationType type,
|
| + const NotificationSource& source,
|
| + const NotificationDetails& details);
|
| +
|
| private:
|
| // Exit handlers:
|
| void OnLoginSignInSelected();
|
| @@ -268,6 +276,8 @@ class WizardController : public chromeos::ScreenObserver,
|
| // URL to open on browser launch.
|
| GURL start_url_;
|
|
|
| + NotificationRegistrar registrar_;
|
| +
|
| FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorNetwork);
|
| FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorUpdate);
|
| FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowEulaDeclined);
|
|
|