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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/autocomplete_popup_view_mac.h

Issue 6256010: Revert 72380 - Remove wstring from autocomplete.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_popup_view_mac.h
===================================================================
--- chrome/browser/autocomplete/autocomplete_popup_view_mac.h (revision 72382)
+++ chrome/browser/autocomplete/autocomplete_popup_view_mac.h (working copy)
@@ -102,7 +102,7 @@
// and description cases. Returns NSMutableAttributedString as a
// convenience for MatchText().
static NSMutableAttributedString* DecorateMatchedString(
- const string16 &matchString,
+ const std::wstring &matchString,
const AutocompleteMatch::ACMatchClassifications &classifications,
NSColor* textColor, NSColor* dimTextColor, gfx::Font& font);
@@ -114,7 +114,7 @@
// cleaner.
static NSMutableAttributedString* ElideString(
NSMutableAttributedString* aString,
- const string16 originalString,
+ const std::wstring originalString,
const gfx::Font& font,
const float cellWidth);
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc ('k') | chrome/browser/autocomplete/autocomplete_popup_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698