diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 21:19:03 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 21:19:03 +0000 |
commit | 8b67f635a2dee8788e98469d7b93d790bb7866b2 (patch) | |
tree | 1e35187f9358a9639c17150c54c24a42b20db94f /remoting/host/plugin/daemon_controller_mac.cc | |
parent | d2b5ad4cffed253421b3fdaf32e800d4ad72454b (diff) | |
download | chromium_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/plugin/daemon_controller_mac.cc')
-rw-r--r-- | remoting/host/plugin/daemon_controller_mac.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/remoting/host/plugin/daemon_controller_mac.cc b/remoting/host/plugin/daemon_controller_mac.cc index 66505c8..54c59b3 100644 --- a/remoting/host/plugin/daemon_controller_mac.cc +++ b/remoting/host/plugin/daemon_controller_mac.cc @@ -228,15 +228,10 @@ void DaemonControllerMac::DoUpdateConfig( done_callback.Run(RESULT_FAILED); return; } - for (DictionaryValue::key_iterator key(config->begin_keys()); - key != config->end_keys(); ++key) { - std::string value; - if (!config->GetString(*key, &value)) { - LOG(ERROR) << *key << " is not a string."; - done_callback.Run(RESULT_FAILED); - return; - } - config_file.SetString(*key, value); + if (!config_file.CopyFrom(config.get())) { + LOG(ERROR) << "Failed to update configuration."; + done_callback.Run(RESULT_FAILED); + return; } std::string config_data = config_file.GetSerializedData(); |