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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.h

Issue 672233002: ScreenObserver::(Set|Get)UsageStatisticsReporting() are extracted into EulaScreen::Delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 2 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/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index c43a56dc9580d96d073abdd8cf977b8cfbab1b5e..56f87f9bf9ab7839838f208a0ddbf04567099f8c 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -20,6 +20,7 @@
#include "base/timer/timer.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/login/screen_manager.h"
+#include "chrome/browser/chromeos/login/screens/eula_screen.h"
#include "chrome/browser/chromeos/login/screens/screen_observer.h"
class PrefRegistrySimple;
@@ -54,7 +55,9 @@ class UserImageScreen;
// Class that manages control flow between wizard screens. Wizard controller
// interacts with screen controllers to move the user between screens.
-class WizardController : public ScreenObserver, public ScreenManager {
+class WizardController : public ScreenObserver,
+ public ScreenManager,
+ public EulaScreen::Delegate {
public:
// Observes screen changes.
class Observer {
@@ -239,8 +242,6 @@ class WizardController : public ScreenObserver, public ScreenManager {
virtual void ShowCurrentScreen() override;
virtual void OnSetUserNamePassword(const std::string& username,
const std::string& password) override;
- virtual void SetUsageStatisticsReporting(bool val) override;
- virtual bool GetUsageStatisticsReporting() const override;
virtual void SetHostConfiguration() override;
virtual void ConfigureHost(bool accepted_eula,
const std::string& lang,
@@ -251,6 +252,10 @@ class WizardController : public ScreenObserver, public ScreenManager {
virtual void ShowErrorScreen() override;
virtual void HideErrorScreen(BaseScreen* parent_screen) override;
+ // Overridden from EulaScreen::Delegate:
+ virtual void SetUsageStatisticsReporting(bool val) override;
+ virtual bool GetUsageStatisticsReporting() const override;
+
// Notification of a change in the state of an accessibility setting.
void OnAccessibilityStatusChanged(
const AccessibilityStatusEventDetails& details);
« no previous file with comments | « chrome/browser/chromeos/login/screens/screen_observer.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698