| Index: chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| index e63fc195b1c181133c28551f6814dc047f28038b..f29d0da24a9ea86c47664d3b3af6f04bec3c5e3c 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| +++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.h
|
| @@ -6,14 +6,13 @@
|
| #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_ERROR_SCREEN_HANDLER_H_
|
|
|
| #include "base/macros.h"
|
| +#include "chrome/browser/chromeos/login/screens/error_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/network_error_view.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
|
|
|
| namespace chromeos {
|
|
|
| -class NetworkErrorModel;
|
| -
|
| // A class that handles the WebUI hooks in error screen.
|
| class ErrorScreenHandler : public BaseScreenHandler,
|
| public NetworkErrorView,
|
| @@ -22,21 +21,18 @@ class ErrorScreenHandler : public BaseScreenHandler,
|
| ErrorScreenHandler();
|
| ~ErrorScreenHandler() override;
|
|
|
| - // ErrorView:
|
| + private:
|
| + // NetworkErrorView:
|
| void Show() override;
|
| void Hide() override;
|
| - void Bind(NetworkErrorModel& model) override;
|
| + void Bind(ErrorScreen* screen) override;
|
| void Unbind() override;
|
| void ShowOobeScreen(OobeScreen screen) override;
|
|
|
| - private:
|
| - // WebUI message handlers.
|
| - void HandleHideCaptivePortal();
|
| -
|
| - // WebUIMessageHandler implementation:
|
| + // WebUIMessageHandler:
|
| void RegisterMessages() override;
|
|
|
| - // BaseScreenHandler implementation:
|
| + // BaseScreenHandler:
|
| void DeclareLocalizedValues(
|
| ::login::LocalizedValuesBuilder* builder) override;
|
| void Initialize() override;
|
| @@ -44,14 +40,17 @@ class ErrorScreenHandler : public BaseScreenHandler,
|
| // NetworkDropdownHandler:
|
| void OnConnectToNetworkRequested() override;
|
|
|
| + // WebUI message handlers.
|
| + void HandleHideCaptivePortal();
|
| +
|
| // Non-owning ptr.
|
| - NetworkErrorModel* model_;
|
| + ErrorScreen* screen_ = nullptr;
|
|
|
| - // Keeps whether screen should be shown right after initialization.
|
| - bool show_on_init_;
|
| + // Should the screen be shown right after initialization?
|
| + bool show_on_init_ = false;
|
|
|
| // Whether the error screen is currently shown.
|
| - bool showing_;
|
| + bool showing_ = false;
|
|
|
| base::WeakPtrFactory<ErrorScreenHandler> weak_ptr_factory_;
|
|
|
|
|