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

chrome/browser/chromeos/login/update_screen.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UPDATE_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_UPDATE_SCREEN_H_
 #pragma once
 
 #include <set>
 
 #include "base/gtest_prod_util.h"
 #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);
   virtual ~UpdateScreen();
 
   // Overridden from WizardScreen.
   virtual void PrepareToShow();
   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);
 
   // Returns true if this instance is still active (i.e. has not been deleted).
   static bool HasInstance(UpdateScreen* inst);
 
   void SetIgnoreIdleStatus(bool ignore_idle_status);
 
   enum ExitReason {
@@ skipping 49 matching lines @@
 
   // Keeps actor which is delegated with all showing operations.
   UpdateScreenActor* actor_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_UPDATE_SCREEN_H_