summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r--chrome/renderer/render_view.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index eb0ccf7..2d614b4 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1074,8 +1074,7 @@ void RenderView::UpdateURL(WebFrame* frame) {
// Top-level navigation.
// Update contents MIME type for main frame.
- std::wstring mime_type = ds->GetResponseMimeType();
- params.contents_mime_type = WideToASCII(mime_type);
+ params.contents_mime_type = ds->GetResponse().GetMimeType();
// We assume top level navigations initiated by the renderer are link
// clicks.
@@ -1479,9 +1478,9 @@ void RenderView::DidChangeLocationWithinPageForFrame(WebView* webview,
WebFrame* frame,
bool is_new_navigation) {
DidCommitLoadForFrame(webview, frame, is_new_navigation);
- const std::wstring& title =
+ const string16& title =
webview->GetMainFrame()->GetDataSource()->GetPageTitle();
- UpdateTitle(frame, title);
+ UpdateTitle(frame, UTF16ToWideHack(title));
}
void RenderView::DidReceiveIconForFrame(WebView* webview,