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

Unified Diff: chrome/renderer/render_view.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 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/renderer/render_view.h ('k') | chrome/test/automated_ui_tests/automated_ui_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d67e818a68cd1ecc8449e10675991a6629411234..6dae35bc0440b79de701492ff64fb228f7b6a63c 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1001,7 +1001,7 @@ void RenderView::UpdateTitle(WebFrame* frame, const std::wstring& title) {
}
void RenderView::UpdateEncoding(WebFrame* frame,
- const std::wstring& encoding_name) {
+ const std::string& encoding_name) {
// Only update main frame's encoding_name.
if (webview()->GetMainFrame() == frame &&
last_encoding_name_ != encoding_name) {
@@ -2575,7 +2575,7 @@ void RenderView::OnInsertText(const string16& text) {
frame->insertText(text);
}
-void RenderView::OnSetPageEncoding(const std::wstring& encoding_name) {
+void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
webview()->SetPageEncoding(encoding_name);
}
« no previous file with comments | « chrome/renderer/render_view.h ('k') | chrome/test/automated_ui_tests/automated_ui_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698