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

Unified Diff: content/browser/plugin_service.cc

Issue 7649026: Print Preview: Always enable the internal PDF plugin for print preview. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | « content/browser/plugin_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_service.cc
===================================================================
--- content/browser/plugin_service.cc (revision 96803)
+++ content/browser/plugin_service.cc (working copy)
@@ -4,8 +4,6 @@
#include "content/browser/plugin_service.h"
-#include <vector>
-
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/path_service.h"
@@ -360,7 +358,8 @@
for (size_t i = 0; i < overridden_plugins_.size(); ++i) {
if (overridden_plugins_[i].render_process_id == render_process_id &&
overridden_plugins_[i].render_view_id == render_view_id &&
- overridden_plugins_[i].url == url) {
+ (overridden_plugins_[i].url == url ||
+ overridden_plugins_[i].url.is_empty())) {
if (actual_mime_type)
*actual_mime_type = mime_type;
*info = overridden_plugins_[i].plugin;
@@ -487,10 +486,10 @@
const FilePath& plugin_path) {
PepperPluginInfo* info = NULL;
for (size_t i = 0; i < ppapi_plugins_.size(); i++) {
- if (ppapi_plugins_[i].path == plugin_path) {
- info = &ppapi_plugins_[i];
- break;
- }
+ if (ppapi_plugins_[i].path == plugin_path) {
+ info = &ppapi_plugins_[i];
+ break;
+ }
}
return info;
}
« no previous file with comments | « content/browser/plugin_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698