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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/plugin_service.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/chromeos/plugin_selection_policy_unittest.cc ('k') | chrome/browser/renderer_host/resource_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugin_service.cc
===================================================================
--- chrome/browser/plugin_service.cc (revision 62937)
+++ chrome/browser/plugin_service.cc (working copy)
@@ -262,6 +262,7 @@
this, &PluginService::GetAllowedPluginForOpenChannelToPlugin,
renderer_msg_filter, url, mime_type, reply_msg));
}
+
void PluginService::GetAllowedPluginForOpenChannelToPlugin(
ResourceMessageFilter* renderer_msg_filter,
const GURL& url,
@@ -273,6 +274,7 @@
FilePath plugin_path;
if (found && info.enabled)
plugin_path = FilePath(info.path);
+
// Now we jump back to the IO thread to finish opening the channel.
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
« no previous file with comments | « chrome/browser/chromeos/plugin_selection_policy_unittest.cc ('k') | chrome/browser/renderer_host/resource_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698