diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 22:50:54 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 22:50:54 +0000 |
| commit | 9d806f57abc6b55a5decad8b230b1f8c31c692ba (patch) | |
| tree | 2d2d2a8c0be9c543da908b5dadf4a3c5062bc72b /chrome/renderer | |
| parent | 56d01f63dc6ddb958dd8ce1d0c711ed87c3f0180 (diff) | |
| download | chromium_src-9d806f57abc6b55a5decad8b230b1f8c31c692ba.zip chromium_src-9d806f57abc6b55a5decad8b230b1f8c31c692ba.tar.gz chromium_src-9d806f57abc6b55a5decad8b230b1f8c31c692ba.tar.bz2 | |
Some minor cleanup in WebDataSource and WebResponse.
R=dglazkov
Review URL: http://codereview.chromium.org/42156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 7 |
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, |