3 files changed, 45 insertions, 2 deletions

diff --git a/common/cloudmanager.h b/common/cloudmanager.h
index 6b5768280a..8a10a1a3c7 100644
--- a/common/cloudmanager.h
+++ b/common/cloudmanager.h
@@ -29,8 +29,16 @@ namespace Common {
 
 class CloudManager {
 public:
-	CloudManager() {};
-	virtual ~CloudManager() {};
+	CloudManager() {}
+	virtual ~CloudManager() {}
+
+	/**
+	* Loads all information from configs and creates current Storage instance.
+	*
+	* @note It's called once on startup in scummvm_main().
+	*/
+
+	virtual void init() = 0;
 
 	/**
 	* Returns active Storage, which could be used to interact
diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 24c877a4e9..40d8aca219 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -45,6 +45,10 @@ char const *const ConfigManager::kTransientDomain = "__TRANSIENT";
 char const *const ConfigManager::kKeymapperDomain = "keymapper";
 #endif
 
+#ifdef USE_CLOUD
+char const *const ConfigManager::kCloudDomain = "cloud";
+#endif
+
 #pragma mark -
 
 
@@ -67,6 +71,9 @@ void ConfigManager::copyFrom(ConfigManager &source) {
 #ifdef ENABLE_KEYMAPPER
 	_keymapperDomain = source._keymapperDomain;
 #endif
+#ifdef USE_CLOUD
+	_cloudDomain = source._cloudDomain;
+#endif
 	_domainSaveOrder = source._domainSaveOrder;
 	_activeDomainName = source._activeDomainName;
 	_activeDomain = &_gameDomains[_activeDomainName];
@@ -121,6 +128,10 @@ void ConfigManager::addDomain(const String &domainName, const ConfigManager::Dom
 	} else if (domainName == kKeymapperDomain) {
 		_keymapperDomain = domain;
 #endif
+#ifdef USE_CLOUD
+	} else if (domainName == kCloudDomain) {		
+		_cloudDomain = domain;
+#endif
 	} else if (domain.contains("gameid")) {
 		// If the domain contains "gameid" we assume it's a game domain
 		if (_gameDomains.contains(domainName))
@@ -160,6 +171,9 @@ void ConfigManager::loadFromStream(SeekableReadStream &stream) {
 #ifdef ENABLE_KEYMAPPER
 	_keymapperDomain.clear();
 #endif
+#ifdef USE_CLOUD
+	_cloudDomain.clear();
+#endif
 
 	// TODO: Detect if a domain occurs multiple times (or likewise, if
 	// a key occurs multiple times inside one domain).
@@ -272,6 +286,10 @@ void ConfigManager::flushToDisk() {
 	// Write the keymapper domain
 	writeDomain(*stream, kKeymapperDomain, _keymapperDomain);
 #endif
+#ifdef USE_CLOUD
+	// Write the cloud domain
+	writeDomain(*stream, kCloudDomain, _cloudDomain);
+#endif
 
 	DomainMap::const_iterator d;
 
@@ -359,6 +377,10 @@ const ConfigManager::Domain *ConfigManager::getDomain(const String &domName) con
 	if (domName == kKeymapperDomain)
 		return &_keymapperDomain;
 #endif
+#ifdef USE_CLOUD
+	if (domName == kCloudDomain)
+		return &_cloudDomain;
+#endif
 	if (_gameDomains.contains(domName))
 		return &_gameDomains[domName];
 	if (_miscDomains.contains(domName))
@@ -379,6 +401,10 @@ ConfigManager::Domain *ConfigManager::getDomain(const String &domName) {
 	if (domName == kKeymapperDomain)
 		return &_keymapperDomain;
 #endif
+#ifdef USE_CLOUD
+	if (domName == kCloudDomain)
+		return &_cloudDomain;
+#endif
 	if (_gameDomains.contains(domName))
 		return &_gameDomains[domName];
 	if (_miscDomains.contains(domName))
diff --git a/common/config-manager.h b/common/config-manager.h
index 14f911f69d..669faaaf88 100644
--- a/common/config-manager.h
+++ b/common/config-manager.h
@@ -94,6 +94,11 @@ public:
 	static char const *const kKeymapperDomain;
 #endif
 
+#ifdef USE_CLOUD
+	/** The name of cloud domain used to store user's tokens */
+	static char const *const kCloudDomain;
+#endif
+
 	void				loadDefaultConfigFile();
 	void				loadConfigFile(const String &filename);
 
@@ -188,6 +193,10 @@ private:
 	Domain			_keymapperDomain;
 #endif
 
+#ifdef USE_CLOUD
+	Domain			_cloudDomain;
+#endif
+
 	Array<String>	_domainSaveOrder;
 
 	String			_activeDomainName;