[cros] check for updates in WebUI OOBE can be cancelled in dev builds.

chrome/browser/chromeos/login/update_screen.h

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..e7ca29e77a245bb076f1556d8baaac2e30b0fe6a 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,13 @@ class UpdateScreen: public UpdateLibrary::Observer,
   virtual void Show();
   virtual void Hide();
 
+  // UpdateScreenActor::Delegate implementation:
+  virtual void CancelUpdate();

[whywhat, 2011/08/29 17:55:51]

nit: We append OVERRIDE for each new virtual method redefinition.

[Ivan Korotkov, 2011/08/29 18:19:17]

Done.

+
   // 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);