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

Unified Diff: chrome/service/cloud_print/cloud_print_proxy.cc

Issue 14215009: Changed cloud print private API to pass all page settings as single object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « chrome/service/cloud_print/cloud_print_proxy.h ('k') | chrome/service/cloud_print/connector_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/cloud_print/cloud_print_proxy.cc
diff --git a/chrome/service/cloud_print/cloud_print_proxy.cc b/chrome/service/cloud_print/cloud_print_proxy.cc
index 12eee709d301b44a596057be09efa79f571e0e98..c3df3c137bf003bf234a2f3cf830ed95a548c241 100644
--- a/chrome/service/cloud_print/cloud_print_proxy.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy.cc
@@ -118,8 +118,7 @@ void CloudPrintProxy::EnableForUserWithRobot(
const std::string& robot_auth_code,
const std::string& robot_email,
const std::string& user_email,
- bool connect_new_printers,
- const std::vector<std::string>& printer_blacklist) {
+ const base::DictionaryValue& user_settings) {
DCHECK(CalledOnValidThread());
ShutdownBackend();
@@ -130,14 +129,8 @@ void CloudPrintProxy::EnableForUserWithRobot(
// Keep only proxy id;
service_prefs_->SetString(prefs::kCloudPrintProxyId, proxy_id);
}
- service_prefs_->SetBoolean(prefs::kCloudPrintConnectNewPrinters,
- connect_new_printers);
- if (!printer_blacklist.empty()) {
- scoped_ptr<base::ListValue> printers(new base::ListValue());
- printers->AppendStrings(printer_blacklist);
- service_prefs_->SetValue(prefs::kCloudPrintPrinterBlacklist,
- printers.release());
- }
+ service_prefs_->SetValue(prefs::kCloudPrintUserSettings,
+ user_settings.DeepCopy());
service_prefs_->WritePrefs();
if (!CreateBackend())
« no previous file with comments | « chrome/service/cloud_print/cloud_print_proxy.h ('k') | chrome/service/cloud_print/connector_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698