Index: chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc |
diff --git a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc |
index ceb341b5fc1c2d6d277a3b8d5cfda3b83a1098b1..daca87b8ac743217ed81694b6f568cbf25714ed3 100644 |
--- a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc |
+++ b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc |
@@ -4,6 +4,9 @@ |
#include "chrome/browser/ui/autofill/save_card_bubble_controller_impl.h" |
+#include "base/i18n/message_formatter.h" |
+#include "base/strings/string_util.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/ui/autofill/save_card_bubble_view.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_finder.h" |
@@ -16,6 +19,8 @@ |
DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::SaveCardBubbleControllerImpl); |
+namespace autofill { |
+ |
namespace { |
// Number of seconds the bubble and icon will survive navigations, starting |
@@ -23,9 +28,113 @@ namespace { |
// TODO(bondd): Share with ManagePasswordsUIController. |
const int kSurviveNavigationSeconds = 5; |
-} // namespace |
+// Replace "{0}", "{1}", ... in |template_icu| with corresponding strings |
+// from |display_texts|. Sets |out_message| to the resulting string, with |
+// start position of each replacement in |out_offsets|. |
+// Return false on failure. If false is returned then contents of |out_message| |
+// and |out_offsets| are undefined. |
+bool ReplaceTemplatePlaceholders( |
+ const base::string16& template_icu, |
+ const std::vector<base::string16>& display_texts, |
+ base::string16* out_message, |
+ std::vector<size_t>* out_offsets) { |
+ // Escape "$" -> "$$" for ReplaceStringPlaceholders(). |
+ // |
+ // Edge cases: |
+ // 1. Two or more consecutive $ characters will be incorrectly expanded |
+ // ("$$" -> "$$$$", which ReplaceStringPlaceholders() then turns into |
+ // "$$$"). |
+ // |
+ // 2. "${" will cause false to be returned. "${0}" will expand to "$${0}". |
+ // FormatWithNumberedArgs() turns it into "$$$1", which |
+ // ReplaceStringPlaceholders() then turns into "$$1" without doing the |
+ // parameter replacement. This causes false to be returned because each |
+ // parameter is not used exactly once. |
+ // |
+ // Both of these cases are noted in the header file, and are unlikely to |
+ // occur in any actual legal message. |
+ base::string16 template_icu_escaped; |
+ base::ReplaceChars(template_icu, base::ASCIIToUTF16("$"), |
+ base::ASCIIToUTF16("$$"), &template_icu_escaped); |
-namespace autofill { |
+ // Replace "{0}" -> "$1", "{1}" -> "$2", ... to prepare |template_dollars| |
+ // for ReplaceStringPlaceholders(). |
+ base::string16 template_dollars = |
+ base::i18n::MessageFormatter::FormatWithNumberedArgs( |
+ template_icu_escaped, "$1", "$2", "$3", "$4", "$5", "$6", "$7"); |
+ |
+ // FormatWithNumberedArgs() returns an empty string on failure. |
+ if (template_dollars.empty() && !template_icu.empty()) |
+ return false; |
+ |
+ // Replace "$1", "$2", ... with the display text of each parameter. |
+ *out_message = base::ReplaceStringPlaceholders(template_dollars, |
+ display_texts, out_offsets); |
+ |
+ // Each parameter must be used exactly once. If a parameter is unused or |
+ // used more than once then it can't be determined which |offsets| entry |
+ // corresponds to which parameter. |
+ return out_offsets->size() == display_texts.size(); |
+} |
+ |
+// Parses |line| and sets |out|. |
+// Returns false on failure. |out| is not modified if false is returned. |
+bool ParseLegalMessageLine(const base::DictionaryValue& line, |
+ SaveCardBubbleController::LegalMessageLine* out) { |
+ SaveCardBubbleController::LegalMessageLine result; |
+ |
+ // |display_texts| elements are the strings that will be substituted for |
+ // "{0}", "{1}", etc. in the template string. |
+ std::vector<base::string16> display_texts; |
+ |
+ // Process all the template parameters. |
+ const base::ListValue* template_parameters = nullptr; |
+ if (line.GetList("template_parameter", &template_parameters)) { |
+ display_texts.resize(template_parameters->GetSize()); |
+ result.links.resize(template_parameters->GetSize()); |
+ |
+ for (size_t parameter_index = 0; |
+ parameter_index < template_parameters->GetSize(); ++parameter_index) { |
+ const base::DictionaryValue* single_parameter; |
+ std::string url; |
+ if (!template_parameters->GetDictionary(parameter_index, |
+ &single_parameter) || |
+ !single_parameter->GetString("display_text", |
+ &display_texts[parameter_index]) || |
+ !single_parameter->GetString("url", &url)) { |
+ return false; |
+ } |
+ result.links[parameter_index].url = GURL(url); |
+ } |
+ } |
+ |
+ // Read the template string. It's a small subset of the ICU message format |
+ // syntax. |
+ base::string16 template_icu; |
+ if (!line.GetString("template", &template_icu)) |
+ return false; |
+ |
+ // Replace the placeholders in |template_icu| with strings from |
+ // |display_texts|, and store the start position of each replacement in |
+ // |offsets|. |
+ std::vector<size_t> offsets; |
+ if (!ReplaceTemplatePlaceholders(template_icu, display_texts, &result.text, |
+ &offsets)) { |
+ return false; |
+ } |
+ |
+ // Fill in range values for all links. |
+ for (size_t offset_index = 0; offset_index < offsets.size(); ++offset_index) { |
+ size_t range_start = offsets[offset_index]; |
+ result.links[offset_index].range = gfx::Range( |
+ range_start, range_start + display_texts[offset_index].size()); |
+ } |
+ |
+ *out = result; |
+ return true; |
+} |
+ |
+} // namespace |
SaveCardBubbleControllerImpl::SaveCardBubbleControllerImpl( |
content::WebContents* web_contents) |
@@ -54,6 +163,23 @@ void SaveCardBubbleControllerImpl::InitializeForUpload( |
// TODO(bondd): Store legal_message here. |
} |
+bool SaveCardBubbleControllerImpl::SetLegalMessage( |
+ const base::ListValue& lines) { |
+ // Process all lines of the message. See comment in header file for example |
+ // of valid |lines| data. |
+ legal_message_lines_.resize(lines.GetSize()); |
+ for (size_t i = 0; i < lines.GetSize(); ++i) { |
+ const base::DictionaryValue* single_line; |
+ if (!lines.GetDictionary(i, &single_line) || |
+ !ParseLegalMessageLine(*single_line, &legal_message_lines_[i])) { |
+ legal_message_lines_.clear(); |
+ return false; |
+ } |
+ } |
+ |
+ return true; |
+} |
+ |
void SaveCardBubbleControllerImpl::ShowBubble(bool user_action) { |
DCHECK(!save_card_callback_.is_null()); |
@@ -104,9 +230,11 @@ void SaveCardBubbleControllerImpl::OnCancelButton() { |
} |
void SaveCardBubbleControllerImpl::OnLearnMoreClicked() { |
- web_contents()->OpenURL(content::OpenURLParams( |
- GURL(kHelpURL), content::Referrer(), NEW_FOREGROUND_TAB, |
- ui::PAGE_TRANSITION_LINK, false)); |
+ OpenUrl(GURL(kHelpURL)); |
+} |
+ |
+void SaveCardBubbleControllerImpl::OnLegalMessageLinkClicked(const GURL& url) { |
+ OpenUrl(url); |
} |
void SaveCardBubbleControllerImpl::OnBubbleClosed() { |
@@ -114,12 +242,23 @@ void SaveCardBubbleControllerImpl::OnBubbleClosed() { |
UpdateIcon(); |
} |
+const SaveCardBubbleController::LegalMessageLines& |
+SaveCardBubbleControllerImpl::GetLegalMessageLines() const { |
+ return legal_message_lines_; |
+} |
+ |
void SaveCardBubbleControllerImpl::UpdateIcon() { |
Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); |
LocationBar* location_bar = browser->window()->GetLocationBar(); |
location_bar->UpdateSaveCreditCardIcon(); |
} |
+void SaveCardBubbleControllerImpl::OpenUrl(const GURL& url) { |
+ web_contents()->OpenURL( |
+ content::OpenURLParams(url, content::Referrer(), NEW_FOREGROUND_TAB, |
+ ui::PAGE_TRANSITION_LINK, false)); |
+} |
+ |
void SaveCardBubbleControllerImpl::DidNavigateMainFrame( |
const content::LoadCommittedDetails& details, |
const content::FrameNavigateParams& params) { |