Merge 244632 "kiosk: Do update check during launch."

chrome/browser/chromeos/app_mode/kiosk_app_manager.h

 // Copyright 2013 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_APP_MODE_KIOSK_APP_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "ui/gfx/image/image_skia.h"
 
 class PrefRegistrySimple;
+class Profile;
 
 namespace base {
 class RefCountedString;
 }
 
+namespace extensions {
+class Extension;
+}
+
 namespace chromeos {
 
 class KioskAppData;
 class KioskAppManagerObserver;
 
 // KioskAppManager manages cached app data.
 class KioskAppManager : public KioskAppDataDelegate {
  public:
   enum ConsumerKioskModeStatus {
     // Consumer kiosk mode can be enabled on this machine.
@@ skipping 79 matching lines @@
   // |app| is populated. Otherwise, return false.
   bool GetApp(const std::string& app_id, App* app) const;
 
   // Gets the raw icon data for the given app id. Returns NULL if |app_id|
   // is unknown.
   const base::RefCountedString* GetAppRawIcon(const std::string& app_id) const;
 
   // Gets whether the bailout shortcut is disabled.
   bool GetDisableBailoutShortcut() const;
 
+  // Clears locally cached app data.
+  void ClearAppData(const std::string& app_id);
+
+  // Updates app data from the |app| in |profile|. |app| is provided to cover
+  // the case of app update case where |app| is the new version and is not
+  // finished installing (e.g. because old version is still running). Otherwise,
+  // |app| could be NULL and the current installed app in |profile| will be
+  // used.
+  void UpdateAppDataFromProfile(const std::string& app_id,
+                                Profile* profile,
+                                const extensions::Extension* app);
+
   void AddObserver(KioskAppManagerObserver* observer);
   void RemoveObserver(KioskAppManagerObserver* observer);
 
  private:
   friend struct base::DefaultLazyInstanceTraits<KioskAppManager>;
   friend struct base::DefaultDeleter<KioskAppManager>;
   friend class KioskAppManagerTest;
   friend class KioskTest;
 
   enum AutoLoginState {
     AUTOLOGIN_NONE      = 0,
     AUTOLOGIN_REQUESTED = 1,
     AUTOLOGIN_APPROVED  = 2,
     AUTOLOGIN_REJECTED  = 3,
   };
 
   KioskAppManager();
   virtual ~KioskAppManager();
 
   // Stop all data loading and remove its dependency on CrosSettings.
   void CleanUp();
 
   // Gets KioskAppData for the given app id.
   const KioskAppData* GetAppData(const std::string& app_id) const;
+  KioskAppData* GetAppDataMutable(const std::string& app_id);
 
   // Update app data |apps_| based on CrosSettings.
   void UpdateAppData();
 
   // KioskAppDataDelegate overrides:
   virtual void GetKioskAppIconCacheDir(base::FilePath* cache_dir) OVERRIDE;
   virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE;
   virtual void OnKioskAppDataLoadFailure(const std::string& app_id) OVERRIDE;
 
   // Callback for EnterpriseInstallAttributes::LockDevice() during
   // EnableConsumerModeKiosk() call.
   void OnLockDevice(
       const EnableKioskModeCallback& callback,
       policy::EnterpriseInstallAttributes::LockResult result);
 
   // Callback for EnterpriseInstallAttributes::ReadImmutableAttributes() during
   // GetConsumerKioskModeStatus() call.
   void OnReadImmutableAttributes(
       const GetConsumerKioskModeStatusCallback& callback);
 
   // Callback for reading handling checks of the owner public.
   void OnOwnerFileChecked(
       const GetConsumerKioskModeStatusCallback& callback,
-      bool *owner_present);
+      bool* owner_present);
 
   // Reads/writes auto login state from/to local state.
   AutoLoginState GetAutoLoginState() const;
   void SetAutoLoginState(AutoLoginState state);
 
   // True if machine ownership is already established.
   bool ownership_established_;
   ScopedVector<KioskAppData> apps_;
   std::string auto_launch_app_id_;
   ObserverList<KioskAppManagerObserver, true> observers_;
 
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_accounts_subscription_;
   scoped_ptr<CrosSettings::ObserverSubscription>
       local_account_auto_login_id_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_