Index: chrome/service/cloud_print/connector_settings.cc |
diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc |
index 0976c422ccd22b451385d229e9059568c9066cfb..57612f85b88670e62f6fff8241cc8d0da8eb4004 100644 |
--- a/chrome/service/cloud_print/connector_settings.cc |
+++ b/chrome/service/cloud_print/connector_settings.cc |
@@ -19,7 +19,8 @@ const char kDeleteOnEnumFail[] = "delete_on_enum_fail"; |
ConnectorSettings::ConnectorSettings() |
Vitaly Buka (NO REVIEWS)
2012/10/22 20:52:53
pleas update connector_settings_unittest.cc
gene
2012/10/22 21:44:12
Done.
|
: delete_on_enum_fail_(false), |
- connect_new_printers_(true) { |
+ connect_new_printers_(true), |
Vitaly Buka (NO REVIEWS)
2012/10/22 20:52:53
xmpp_ping_enabled_ is not initialized
gene
2012/10/22 21:44:12
Done.
|
+ xmpp_ping_timeout_sec_(kDefaultXmppPingTimeoutSecs) { |
} |
ConnectorSettings::~ConnectorSettings() { |
@@ -56,6 +57,12 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) { |
connect_new_printers_ = prefs->GetBoolean( |
prefs::kCloudPrintConnectNewPrinters, true); |
+ |
+ xmpp_ping_enabled_ = prefs->GetBoolean( |
+ prefs::kCloudPrintXmppPingEnabled, false); |
+ xmpp_ping_timeout_sec_ = prefs->GetInt( |
+ prefs::kCloudPrintXmppPingTimeout, kDefaultXmppPingTimeoutSecs); |
+ |
const base::ListValue* printers = prefs->GetList( |
prefs::kCloudPrintPrinterBlacklist); |
if (printers) { |
@@ -76,6 +83,7 @@ void ConnectorSettings::CopyFrom(const ConnectorSettings& source) { |
proxy_id_ = source.proxy_id(); |
delete_on_enum_fail_ = source.delete_on_enum_fail(); |
Vitaly Buka (NO REVIEWS)
2012/10/22 20:52:53
xmpp_ping_enabled_ is not copied
That's why i'd j
gene
2012/10/22 21:44:12
Done.
|
connect_new_printers_ = source.connect_new_printers(); |
+ xmpp_ping_timeout_sec_ = source.xmpp_ping_timeout_sec_; |
printer_blacklist_ = source.printer_blacklist_; |
if (source.print_system_settings()) |
print_system_settings_.reset(source.print_system_settings()->DeepCopy()); |