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

Issue 3796011: Merge 62261, 62267, 62265 & 62679... (Closed)

Created:
10 years, 2 months ago by Greg Spencer (Chromium)
Modified:
9 years, 7 months ago
Reviewers:
CC:
chromium-reviews, ben+cc_chromium.org, Paweł Hajdan Jr., jam, pam+watch_chromium.org, davemoore+watch_chromium.org, brettw-cc_chromium.org, darin-cc_chromium.org, stuartmorgan+watch_chromium.org
Visibility:
Public.

Description

Merge 62261, 62267, 62265 & 62679 Merge 62261 - This changes GetPluginInfo so that we can request a list of plugins that match the criterion (mime type/url) instead of just the first one that matches. This is in preparation for implementing a way for us to switch which flash plugin we select based on a whitelist of domains. Review URL: http://codereview.chromium.org/3530017 Merge 62679 - This adds a plugin selection policy for selecting which plugin is allowed for a particular domain. It is only used on ChromeOS. It reads from a file that is installed in a known location on ChromeOS, and uses that as it's policy. When there are multiple plugins supporting the same mime-type, the appropriate plugin file to load is now selected based on policy. Review URL: http://codereview.chromium.org/3717005 Merge 62267 - Take out bogus DCHECK This DCHECK is valid only within the browser itself -- it doesn't work for tests, etc, which have different default plugins. Merge 62265 - This makes it so we only add the default plugin if it's enabled. BUG=http://crosbug.com/7403 TEST=ran chrome unit_tests, ran chromeos version of chrome, passed trybots. TBR=gspencer@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=62964

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+121 lines, -101 lines) Patch
A + chrome/browser/chromeos/plugin_selection_policy.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + chrome/browser/chromeos/plugin_selection_policy.cc View 0 chunks +-1 lines, --1 lines 0 comments Download
A + chrome/browser/chromeos/plugin_selection_policy_unittest.cc View 0 chunks +-1 lines, --1 lines 0 comments Download
M chrome/browser/plugin_service.cc View 2 chunks +2 lines, -0 lines 0 comments Download
M chrome/browser/renderer_host/resource_message_filter.cc View 2 chunks +3 lines, -0 lines 0 comments Download
M chrome/renderer/render_view.cc View 1 chunk +2 lines, -6 lines 0 comments Download
M webkit/glue/plugins/plugin_list.h View 2 chunks +18 lines, -24 lines 0 comments Download
M webkit/glue/plugins/plugin_list.cc View 2 chunks +98 lines, -66 lines 0 comments Download
M webkit/support/webkit_support.cc View 1 chunk +0 lines, -3 lines 0 comments Download
M webkit/tools/test_shell/test_webview_delegate.cc View 1 chunk +1 line, -5 lines 0 comments Download

Powered by Google App Engine
This is Rietveld 408576698