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

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

Issue 7774009: [cros] check for updates in WebUI OOBE can be cancelled in dev builds. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Added OnActorDestroyed to UpdateScreen::Delegate. Created 9 years, 4 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
« no previous file with comments | « chrome/browser/chromeos/login/mock_update_screen.cc ('k') | chrome/browser/chromeos/login/update_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/update_screen.h
diff --git a/chrome/browser/chromeos/login/update_screen.h b/chrome/browser/chromeos/login/update_screen.h
index 2329b2a6f02784a9dcf29e515aae0c633fa3eed5..7e13f0fff1db17f02337814cba915456a2f40d97 100644
--- a/chrome/browser/chromeos/login/update_screen.h
+++ b/chrome/browser/chromeos/login/update_screen.h
@@ -12,17 +12,18 @@
#include "base/memory/scoped_ptr.h"
#include "base/timer.h"
#include "chrome/browser/chromeos/cros/update_library.h"
+#include "chrome/browser/chromeos/login/update_screen_actor.h"
#include "chrome/browser/chromeos/login/wizard_screen.h"
namespace chromeos {
class ScreenObserver;
-class UpdateScreenActor;
// Controller for the update screen. It does not depend on the specific
// implementation of the screen showing (Views of WebUI based), the dependency
// is moved to the UpdateScreenActor instead.
class UpdateScreen: public UpdateLibrary::Observer,
+ public UpdateScreenActor::Delegate,
public WizardScreen {
public:
UpdateScreen(ScreenObserver* screen_observer, UpdateScreenActor* actor);
@@ -33,13 +34,14 @@ class UpdateScreen: public UpdateLibrary::Observer,
virtual void Show();
virtual void Hide();
+ // UpdateScreenActor::Delegate implementation:
+ virtual void CancelUpdate() OVERRIDE;
+ virtual void OnActorDestroyed(UpdateScreenActor* actor) OVERRIDE;
+
// Checks for updates and performs an update if needed. Made virtual to
// simplify mocking.
virtual void StartUpdate();
- // Force cancel update. Made virtual to simplify mocking.
- virtual void CancelUpdate();
-
// Reboot check delay get/set, in seconds.
int reboot_check_delay() const { return reboot_check_delay_; }
void SetRebootCheckDelay(int seconds);
« no previous file with comments | « chrome/browser/chromeos/login/mock_update_screen.cc ('k') | chrome/browser/chromeos/login/update_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698