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

Unified Diff: chrome/browser/ui/views/external_tab_container_win.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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: chrome/browser/ui/views/external_tab_container_win.cc
diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc
index 6bb6eceb3fb945eefb85fc3223b5de909d8fbe0c..0325a33d83ac0cecf2eed0ca4bd851fa2295bc0f 100644
--- a/chrome/browser/ui/views/external_tab_container_win.cc
+++ b/chrome/browser/ui/views/external_tab_container_win.cc
@@ -552,7 +552,7 @@ void ExternalTabContainerWin::AddNewContents(WebContents* source,
attach_params_.dimensions = initial_pos;
attach_params_.user_gesture = user_gesture;
attach_params_.disposition = disposition;
- attach_params_.profile_name = WideToUTF8(
+ attach_params_.profile_name = base::WideToUTF8(
profile->GetPath().DirName().BaseName().value());
automation_->Send(new AutomationMsg_AttachExternalTab(
tab_handle_, attach_params_));
@@ -1020,9 +1020,9 @@ bool ExternalTabContainerWin::InitNavigationInfo(
web_contents_->GetController().GetCurrentEntryIndex();
nav_info->url = entry->GetURL();
nav_info->referrer = entry->GetReferrer().url;
- nav_info->title = UTF16ToWideHack(entry->GetTitle());
+ nav_info->title = base::UTF16ToWideHack(entry->GetTitle());
if (nav_info->title.empty())
- nav_info->title = UTF8ToWide(nav_info->url.spec());
+ nav_info->title = base::UTF8ToWide(nav_info->url.spec());
nav_info->security_style = entry->GetSSL().security_style;
int content_status = entry->GetSSL().content_status;
« no previous file with comments | « chrome/browser/ui/views/external_protocol_dialog.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698