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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.h

Issue 137343003: kiosk: Do update check during launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for #1 comments, use default for empty update url and skip for bad update url Created 6 years, 11 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/app_mode/kiosk_app_manager.h
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
index 4b826e8b3138cf1a3b02d27fe20fa67864354031..e67b86ceec9baee2ad6db31bd4abdea010cca244 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
@@ -20,11 +20,16 @@
#include "ui/gfx/image/image_skia.h"
class PrefRegistrySimple;
+class Profile;
namespace base {
class RefCountedString;
}
+namespace extensions {
+class Extension;
+}
+
namespace chromeos {
class KioskAppData;
@@ -124,6 +129,18 @@ class KioskAppManager : public KioskAppDataDelegate {
// 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);
@@ -148,6 +165,7 @@ class KioskAppManager : public KioskAppDataDelegate {
// 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();
@@ -171,7 +189,7 @@ class KioskAppManager : public KioskAppDataDelegate {
// 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;
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_data.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698