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

Unified Diff: components/autofill/browser/autocomplete_history_manager.h

Issue 13973004: Convert string16 -> base::string16 in components/ (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
Index: components/autofill/browser/autocomplete_history_manager.h
diff --git a/components/autofill/browser/autocomplete_history_manager.h b/components/autofill/browser/autocomplete_history_manager.h
index 60a9f08e7354bc66cdbfc0a4382761f0a862a7ee..2152062ffee534082575f04c04dcbe541a7d6511 100644
--- a/components/autofill/browser/autocomplete_history_manager.h
+++ b/components/autofill/browser/autocomplete_history_manager.h
@@ -42,16 +42,17 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
// dispatched a message.
void OnGetAutocompleteSuggestions(
int query_id,
- const string16& name,
- const string16& prefix,
- const std::vector<string16>& autofill_values,
- const std::vector<string16>& autofill_labels,
- const std::vector<string16>& autofill_icons,
+ const base::string16& name,
+ const base::string16& prefix,
+ const std::vector<base::string16>& autofill_values,
+ const std::vector<base::string16>& autofill_labels,
+ const std::vector<base::string16>& autofill_icons,
const std::vector<int>& autofill_unique_ids);
void OnFormSubmitted(const FormData& form);
// Must be public for the external delegate to use.
- void OnRemoveAutocompleteEntry(const string16& name, const string16& value);
+ void OnRemoveAutocompleteEntry(const base::string16& name,
+ const base::string16& value);
// Sets our external delegate.
void SetExternalDelegate(AutofillExternalDelegate* delegate);
@@ -60,7 +61,7 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
friend class AutofillManagerTest;
// Sends the given |suggestions| for display in the Autofill popup.
- void SendSuggestions(const std::vector<string16>* suggestions);
+ void SendSuggestions(const std::vector<base::string16>* suggestions);
private:
// Cancels the currently pending WebDataService query, if there is one.
@@ -76,9 +77,9 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
// back. We also store the autofill results so we can send them together.
WebDataServiceBase::Handle pending_query_handle_;
int query_id_;
- std::vector<string16> autofill_values_;
- std::vector<string16> autofill_labels_;
- std::vector<string16> autofill_icons_;
+ std::vector<base::string16> autofill_values_;
+ std::vector<base::string16> autofill_labels_;
+ std::vector<base::string16> autofill_icons_;
std::vector<int> autofill_unique_ids_;
// Delegate to perform external processing (display, selection) on

Powered by Google App Engine
This is Rietveld 408576698