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

Unified Diff: chrome/browser/chromeos/login/screens/error_screen.h

Issue 245113003: Removed dependency on the UI from the NetworkPortalDetector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 7 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/error_screen.h
diff --git a/chrome/browser/chromeos/login/screens/error_screen.h b/chrome/browser/chromeos/login/screens/error_screen.h
index bd20d81f9efa0e21734983764cdc0d296949ba0c..66cb7705c8f28f46faafbba8d1d659bb1fee9d3b 100644
--- a/chrome/browser/chromeos/login/screens/error_screen.h
+++ b/chrome/browser/chromeos/login/screens/error_screen.h
@@ -9,7 +9,6 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
#include "chrome/browser/chromeos/login/login_performer.h"
#include "chrome/browser/chromeos/login/oobe_display.h"
#include "chrome/browser/chromeos/login/screens/error_screen_actor_delegate.h"
@@ -25,13 +24,6 @@ class ErrorScreen : public WizardScreen,
public ErrorScreenActorDelegate,
public LoginPerformer::Delegate {
public:
- class Observer {
- public:
- virtual ~Observer() {}
- virtual void OnErrorScreenShow() = 0;
- virtual void OnErrorScreenHide() = 0;
- };
-
enum UIState {
UI_STATE_UNKNOWN = 0,
UI_STATE_UPDATE,
@@ -54,9 +46,6 @@ class ErrorScreen : public WizardScreen,
ErrorScreen(ScreenObserver* screen_observer, ErrorScreenActor* actor);
virtual ~ErrorScreen();
- void AddObserver(Observer* observer);
- void RemoveObserver(Observer* observer);
-
// WizardScreen implementation.
virtual void PrepareToShow() OVERRIDE;
virtual void Show() OVERRIDE;
@@ -117,12 +106,10 @@ class ErrorScreen : public WizardScreen,
OobeDisplay::Screen parent_screen_;
- base::WeakPtrFactory<ErrorScreen> weak_factory_;
-
- ObserverList<Observer> observers_;
-
scoped_ptr<LoginPerformer> guest_login_performer_;
+ base::WeakPtrFactory<ErrorScreen> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ErrorScreen);
};

Powered by Google App Engine
This is Rietveld 408576698