summaryrefslogtreecommitdiffstats
path: root/cloud_print/service/win/cloud_print_service.cc
diff options
context:
space:
mode:
Diffstat (limited to 'cloud_print/service/win/cloud_print_service.cc')
-rw-r--r--cloud_print/service/win/cloud_print_service.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index 6f58095..2e15398 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -80,10 +80,11 @@ void InvalidUsage() {
std::cout << "\n";
}
-base::string16 GetOption(int string_id, const base::string16& default,
- bool secure) {
+base::string16 GetOption(int string_id,
+ const base::string16& default_option,
+ bool secure) {
base::string16 prompt_format = cloud_print::LoadLocalString(string_id);
- std::vector<base::string16> substitutions(1, default);
+ std::vector<base::string16> substitutions(1, default_option);
std::cout << ReplaceStringPlaceholders(prompt_format, substitutions, NULL);
base::string16 tmp;
if (secure) {
@@ -99,7 +100,7 @@ base::string16 GetOption(int string_id, const base::string16& default,
std::getline(std::wcin, tmp);
}
if (tmp.empty())
- return default;
+ return default_option;
return tmp;
}