summaryrefslogtreecommitdiffstats
path: root/remoting/host/in_memory_host_config.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 21:19:03 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-16 21:19:03 +0000
commit8b67f635a2dee8788e98469d7b93d790bb7866b2 (patch)
tree1e35187f9358a9639c17150c54c24a42b20db94f /remoting/host/in_memory_host_config.h
parentd2b5ad4cffed253421b3fdaf32e800d4ad72454b (diff)
downloadchromium_src-8b67f635a2dee8788e98469d7b93d790bb7866b2.zip
chromium_src-8b67f635a2dee8788e98469d7b93d790bb7866b2.tar.gz
chromium_src-8b67f635a2dee8788e98469d7b93d790bb7866b2.tar.bz2
Fix DaemonControllerLinux::SetConfigAndStart() to reload config automatically.
Also fixed several issues with managing chromoting from the webapp. Now it is possible to start the app and change PIN. BUG=120950 Review URL: https://chromiumcodereview.appspot.com/10824286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/in_memory_host_config.h')
-rw-r--r--remoting/host/in_memory_host_config.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/host/in_memory_host_config.h b/remoting/host/in_memory_host_config.h
index 82b9f6f..7d5357c 100644
--- a/remoting/host/in_memory_host_config.h
+++ b/remoting/host/in_memory_host_config.h
@@ -34,6 +34,8 @@ class InMemoryHostConfig : public MutableHostConfig,
const std::string& in_value) OVERRIDE;
virtual void SetBoolean(const std::string& path, bool in_value) OVERRIDE;
+ virtual bool CopyFrom(const base::DictionaryValue* dictionary) OVERRIDE;
+
virtual bool Save() OVERRIDE;
protected: