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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 6291003: Revert 71485 - Remove wstring from TemplateURL and friends.... (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/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc (revision 71499)
+++ chrome/browser/tab_contents/tab_contents.cc (working copy)
@@ -2175,7 +2175,7 @@
GURL keyword_url = previous_entry->user_typed_url().is_valid() ?
previous_entry->user_typed_url() : previous_entry->url();
- string16 keyword =
+ std::wstring keyword =
TemplateURLModel::GenerateKeyword(keyword_url, true); // autodetected
if (keyword.empty())
return;
@@ -3003,7 +3003,7 @@
if (!keyword_url.is_valid())
return;
- string16 keyword = TemplateURLModel::GenerateKeyword(
+ std::wstring keyword = TemplateURLModel::GenerateKeyword(
keyword_url,
provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER);
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698