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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/render_view.cc

Issue 3796011: Merge 62261, 62267, 62265 & 62679... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/
Patch Set: Created 10 years, 2 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/renderer_host/resource_message_filter.cc ('k') | webkit/glue/plugins/plugin_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 62937)
+++ chrome/renderer/render_view.cc (working copy)
@@ -4066,12 +4066,8 @@
const WebPluginParams& params,
const FilePath& path,
const std::string& mime_type) {
- std::string actual_mime_type(mime_type);
- if (actual_mime_type.empty())
- actual_mime_type = params.mimeType.utf8();
-
- return new webkit_glue::WebPluginImpl(frame, params, path,
- actual_mime_type, AsWeakPtr());
+ return new webkit_glue::WebPluginImpl(
+ frame, params, path, mime_type, AsWeakPtr());
}
WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
« no previous file with comments | « chrome/browser/renderer_host/resource_message_filter.cc ('k') | webkit/glue/plugins/plugin_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698